Skip to content

Commit

Permalink
Reduce TCP listener allocations
Browse files Browse the repository at this point in the history
  • Loading branch information
sparrc committed Apr 5, 2016
1 parent 3046439 commit 0f16c0f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Features
- [#976](https://github.com/influxdata/telegraf/pull/976): Reduce allocations in the UDP and statsd inputs.
- [#979](https://github.com/influxdata/telegraf/pull/979): Reduce allocations in the TCP listener.

### Bugfixes
- [#968](https://github.com/influxdata/telegraf/issues/968): Processes plugin gets unknown state when spaces are in (command name)
Expand Down
10 changes: 5 additions & 5 deletions plugins/inputs/tcp_listener/tcp_listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type TcpListener struct {
acc telegraf.Accumulator
}

var dropwarn = "ERROR: Message queue full. Discarding line [%s] " +
var dropwarn = "ERROR: Message queue full. Discarding metric. " +
"You may want to increase allowed_pending_messages in the config\n"

const sampleConfig = `
Expand Down Expand Up @@ -202,11 +202,10 @@ func (t *TcpListener) handler(conn *net.TCPConn, id string) {
if !scanner.Scan() {
return
}
buf := scanner.Bytes()
select {
case t.in <- buf:
case t.in <- scanner.Bytes():
default:
log.Printf(dropwarn, string(buf))
log.Printf(dropwarn)
}
}
}
Expand All @@ -215,11 +214,12 @@ func (t *TcpListener) handler(conn *net.TCPConn, id string) {
// tcpParser parses the incoming tcp byte packets
func (t *TcpListener) tcpParser() error {
defer t.wg.Done()
var packet []byte
for {
select {
case <-t.done:
return nil
case packet := <-t.in:
case packet = <-t.in:
if len(packet) == 0 {
continue
}
Expand Down

0 comments on commit 0f16c0f

Please sign in to comment.