Move debug messages in tcp input source (#7712)

elastic · Jul 24, 2018 · e879b57 · e879b57
1 parent 4a0c511
commit e879b57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -227,6 +227,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
 - Add deprecation fileset to the Elasticsearch module. {pull}7474[7474]
 - Add `config_timezone` option to Kafka module to convert dates to UTC. {issue}7546[7546] {pull}7578[7578]
 - Add patterns for kafka 1.1 logs. {pull}7608[7608]
+- Move debug messages in tcp input source {pull}7712[7712]
 
 *Heartbeat*
 

diff --git a/filebeat/inputsource/tcp/server.go b/filebeat/inputsource/tcp/server.go
@@ -113,7 +113,6 @@ func (s *Server) run() {
 			s.config.Timeout,
 		)
 
-		s.log.Debugw("New client", "remote_address", conn.RemoteAddr(), "total", s.clientsCount())
 		s.wg.Add(1)
 		go func() {
 			defer logp.Recover("recovering from a tcp client crash")
@@ -122,13 +121,14 @@ func (s *Server) run() {
 
 			s.registerClient(client)
 			defer s.unregisterClient(client)
+			s.log.Debugw("New client", "remote_address", conn.RemoteAddr(), "total", s.clientsCount())
 
 			err := client.handle()
 			if err != nil {
 				s.log.Debugw("Client error", "error", err)
 			}
 
-			s.log.Debugw(
+			defer s.log.Debugw(
 				"Client disconnected",
 				"remote_address",
 				conn.RemoteAddr(),