Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move debug messages in tcp input source #7712

Merged
merged 1 commit into from
Jul 24, 2018
Merged

Move debug messages in tcp input source #7712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
4 changes: 2 additions & 2 deletions filebeat/inputsource/tcp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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(),
Expand Down