From 2d7f612bd70b8832e464dd908a7d976cb3a408c4 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Wed, 29 Mar 2017 14:25:33 -0700 Subject: [PATCH] Use fork of hpcloud/tail (#2595) --- Godeps | 2 +- plugins/inputs/logparser/logparser.go | 2 +- plugins/inputs/tail/tail.go | 2 +- plugins/inputs/tail/tail_test.go | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Godeps b/Godeps index 6cbe9efa7..9717cec2f 100644 --- a/Godeps +++ b/Godeps @@ -21,7 +21,7 @@ github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7 github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478 github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f -github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3 +github.com/influxdata/tail e9ef7e826dafcb3093b40b989fefa90eeb9a8ca1 github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go index a22832277..c5641ba28 100644 --- a/plugins/inputs/logparser/logparser.go +++ b/plugins/inputs/logparser/logparser.go @@ -6,7 +6,7 @@ import ( "reflect" "sync" - "github.com/hpcloud/tail" + "github.com/influxdata/tail" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go index 0c19f9116..f57d970cf 100644 --- a/plugins/inputs/tail/tail.go +++ b/plugins/inputs/tail/tail.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/hpcloud/tail" + "github.com/influxdata/tail" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/globpath" diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go index b927d160c..7ddb502f9 100644 --- a/plugins/inputs/tail/tail_test.go +++ b/plugins/inputs/tail/tail_test.go @@ -5,7 +5,6 @@ import ( "os" "runtime" "testing" - "time" "github.com/influxdata/telegraf/plugins/parsers" "github.com/influxdata/telegraf/testutil" @@ -59,7 +58,6 @@ func TestTailFromEnd(t *testing.T) { acc := testutil.Accumulator{} require.NoError(t, tt.Start(&acc)) - time.Sleep(time.Millisecond * 200) //TODO remove once https://github.com/hpcloud/tail/pull/114 is merged & added to Godeps for _, tailer := range tt.tailers { for n, err := tailer.Tell(); err == nil && n == 0; n, err = tailer.Tell() { // wait for tailer to jump to end