Merge pull request #45 from CHERTS/ZBX-22470

[ZBX-22470] fixed hang on logging when establishing an encrypted connection in Zabbix agent 2 (kprutkovs)
CHERTS · Sep 14, 2023 · f68b649 · f68b649
2 parents 9e34e1a + ea1c8fb
commit f68b649
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -67,6 +67,7 @@ A......... [ZBX-21332] fixed runtime errors when linking items from two template
 ........S. [ZBX-22215] fixed incorrectly quoted function parameter parsing (wiper)
 .......PS. [ZBX-22304] fixed duplication in web scenario error message, when curl could not resolve host (mprihodko)
 ...G...... [ZBX-22452] fixed Windows Zabbix agent web.page.* unsupported item keys (akozlovs)
+...G...... [ZBX-22470] fixed hang on logging when establishing an encrypted connection in Zabbix agent 2 (kprutkovs)
 ...G...... [ZBX-22521] added debug logging for process selection in proc.mem[] on AIX (Andris)
 ...G...... [ZBX-22695] fixed eventlog duplicate timestamps (asestakovs)
 ........S. [ZBX-22772] added trends cleanup for non-numeric value types (wiper)

diff --git a/PATCHLIST.md b/PATCHLIST.md
@@ -301,6 +301,7 @@
 [ZBX-22215] fixed incorrectly quoted function parameter parsing (https://support.zabbix.com/browse/ZBX-22215)
 [ZBX-22304] fixed duplication in web scenario error message, when curl could not resolve host (https://support.zabbix.com/browse/ZBX-22304)
 [ZBX-22452] fixed Windows Zabbix agent web.page.* unsupported item keys (https://support.zabbix.com/browse/ZBX-22452)
+[ZBX-22470] fixed hang on logging when establishing an encrypted connection in Zabbix agent 2 (https://support.zabbix.com/browse/ZBX-22470)
 [ZBX-22521] added debug logging for process selection in proc.mem[] on AIX (https://support.zabbix.com/browse/ZBX-22521)
 [ZBX-22695] fixed eventlog duplicate timestamps (https://support.zabbix.com/browse/ZBX-22695)
 [ZBX-22772] added trends cleanup for non-numeric value types (https://support.zabbix.com/browse/ZBX-22772)

diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go
@@ -1206,7 +1206,8 @@ func NewClient(nc net.Conn, args ...interface{}) (conn net.Conn, err error) {
 		return
 	}
 
-	log.Debugf("connection established using %s", c)
+	// explicit conversion needed to avoid nested calls to logging
+	log.Debugf("connection established using %s", c.String())
 
 	return c, nil
 }
@@ -1338,7 +1339,7 @@ func NewServer(nc net.Conn, args ...interface{}) (conn net.Conn, err error) {
 		return
 	}
 
-	log.Debugf("connection established using %s", s)
+	log.Debugf("connection established using %s", s.String())
 
 	return s, nil
 }