From b97bc3a1e2d681e6394012022228da77624d1e80 Mon Sep 17 00:00:00 2001 From: KateGo520 <3126965574@qq.com> Date: Tue, 18 Aug 2020 18:28:41 +0800 Subject: [PATCH 1/2] fix module path --- transports/tcp/tcp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transports/tcp/tcp.go b/transports/tcp/tcp.go index 84d2ade9..73b79e22 100644 --- a/transports/tcp/tcp.go +++ b/transports/tcp/tcp.go @@ -3,8 +3,8 @@ package tcp import ( "net" - "github.com/gliderlabs/logspout/adapters/raw" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/adapters/raw" + "github.com/gliderlabs/logspout/v3/router" ) func init() { From 0307a33d5f32964a3fa4ab23bd67b6fa0a108762 Mon Sep 17 00:00:00 2001 From: KateGo520 <3126965574@qq.com> Date: Tue, 18 Aug 2020 18:32:39 +0800 Subject: [PATCH 2/2] fix module path --- adapters/multiline/multiline.go | 2 +- adapters/multiline/multiline_test.go | 2 +- adapters/raw/raw.go | 2 +- adapters/syslog/syslog.go | 4 ++-- adapters/syslog/syslog_test.go | 8 ++++---- custom/modules.go | 8 ++++---- go.mod | 2 +- healthcheck/healthcheck.go | 2 +- httpstream/httpstream.go | 2 +- logspout.go | 5 +++-- modules.go | 18 +++++++++--------- router/http.go | 2 +- router/pump.go | 2 +- router/routes.go | 2 +- routesapi/routesapi.go | 2 +- transports/tls/tls.go | 4 ++-- transports/udp/udp.go | 4 ++-- 17 files changed, 36 insertions(+), 35 deletions(-) diff --git a/adapters/multiline/multiline.go b/adapters/multiline/multiline.go index d2c1d3e3..492e7920 100644 --- a/adapters/multiline/multiline.go +++ b/adapters/multiline/multiline.go @@ -11,7 +11,7 @@ import ( docker "github.com/fsouza/go-dockerclient" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) const ( diff --git a/adapters/multiline/multiline_test.go b/adapters/multiline/multiline_test.go index 2f32ac30..f4a09d48 100644 --- a/adapters/multiline/multiline_test.go +++ b/adapters/multiline/multiline_test.go @@ -9,7 +9,7 @@ import ( docker "github.com/fsouza/go-dockerclient" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) type dummyAdapter struct { diff --git a/adapters/raw/raw.go b/adapters/raw/raw.go index 5ec15b90..17932d66 100644 --- a/adapters/raw/raw.go +++ b/adapters/raw/raw.go @@ -9,7 +9,7 @@ import ( "os" "text/template" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) func init() { diff --git a/adapters/syslog/syslog.go b/adapters/syslog/syslog.go index b5e4e080..9c818238 100644 --- a/adapters/syslog/syslog.go +++ b/adapters/syslog/syslog.go @@ -16,8 +16,8 @@ import ( "text/template" "time" - "github.com/gliderlabs/logspout/cfg" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/cfg" + "github.com/gliderlabs/logspout/v3/router" ) const ( diff --git a/adapters/syslog/syslog_test.go b/adapters/syslog/syslog_test.go index d3a06504..cc89ad54 100644 --- a/adapters/syslog/syslog_test.go +++ b/adapters/syslog/syslog_test.go @@ -14,13 +14,13 @@ import ( "testing" "time" - _ "github.com/gliderlabs/logspout/transports/tcp" - _ "github.com/gliderlabs/logspout/transports/tls" - _ "github.com/gliderlabs/logspout/transports/udp" + _ "github.com/gliderlabs/logspout/v3/transports/tcp" + _ "github.com/gliderlabs/logspout/v3/transports/tls" + _ "github.com/gliderlabs/logspout/v3/transports/udp" docker "github.com/fsouza/go-dockerclient" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) const ( diff --git a/custom/modules.go b/custom/modules.go index 0904f966..55000b3a 100644 --- a/custom/modules.go +++ b/custom/modules.go @@ -3,8 +3,8 @@ package main import ( _ "github.com/looplab/logspout-logstash" - _ "github.com/gliderlabs/logspout/adapters/syslog" - _ "github.com/gliderlabs/logspout/transports/tcp" - _ "github.com/gliderlabs/logspout/transports/tls" - _ "github.com/gliderlabs/logspout/transports/udp" + _ "github.com/gliderlabs/logspout/v3/adapters/syslog" + _ "github.com/gliderlabs/logspout/v3/transports/tcp" + _ "github.com/gliderlabs/logspout/v3/transports/tls" + _ "github.com/gliderlabs/logspout/v3/transports/udp" ) diff --git a/go.mod b/go.mod index 61201246..dc838b1e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gliderlabs/logspout +module github.com/gliderlabs/logspout/v3 go 1.13 diff --git a/healthcheck/healthcheck.go b/healthcheck/healthcheck.go index bbd5bcd1..231f5e79 100644 --- a/healthcheck/healthcheck.go +++ b/healthcheck/healthcheck.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/mux" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) func init() { diff --git a/httpstream/httpstream.go b/httpstream/httpstream.go index dc2fb894..e9d239b4 100644 --- a/httpstream/httpstream.go +++ b/httpstream/httpstream.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/mux" "golang.org/x/net/websocket" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) func init() { diff --git a/logspout.go b/logspout.go index 2ec9e4a4..f35a8843 100644 --- a/logspout.go +++ b/logspout.go @@ -1,5 +1,6 @@ package main + import ( "fmt" "log" @@ -7,8 +8,8 @@ import ( "strings" "text/tabwriter" - "github.com/gliderlabs/logspout/cfg" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/cfg" + "github.com/gliderlabs/logspout/v3/router" ) // Version is the running version of logspout diff --git a/modules.go b/modules.go index 1c2681e2..67ba6c05 100644 --- a/modules.go +++ b/modules.go @@ -1,13 +1,13 @@ package main import ( - _ "github.com/gliderlabs/logspout/adapters/multiline" - _ "github.com/gliderlabs/logspout/adapters/raw" - _ "github.com/gliderlabs/logspout/adapters/syslog" - _ "github.com/gliderlabs/logspout/healthcheck" - _ "github.com/gliderlabs/logspout/httpstream" - _ "github.com/gliderlabs/logspout/routesapi" - _ "github.com/gliderlabs/logspout/transports/tcp" - _ "github.com/gliderlabs/logspout/transports/tls" - _ "github.com/gliderlabs/logspout/transports/udp" + _ "github.com/gliderlabs/logspout/v3/adapters/multiline" + _ "github.com/gliderlabs/logspout/v3/adapters/raw" + _ "github.com/gliderlabs/logspout/v3/adapters/syslog" + _ "github.com/gliderlabs/logspout/v3/healthcheck" + _ "github.com/gliderlabs/logspout/v3/httpstream" + _ "github.com/gliderlabs/logspout/v3/routesapi" + _ "github.com/gliderlabs/logspout/v3/transports/tcp" + _ "github.com/gliderlabs/logspout/v3/transports/tls" + _ "github.com/gliderlabs/logspout/v3/transports/udp" ) diff --git a/router/http.go b/router/http.go index 09243ef8..912749c6 100644 --- a/router/http.go +++ b/router/http.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/gliderlabs/logspout/cfg" + "github.com/gliderlabs/logspout/v3/cfg" ) func init() { diff --git a/router/pump.go b/router/pump.go index d1586493..f73b59f0 100644 --- a/router/pump.go +++ b/router/pump.go @@ -12,7 +12,7 @@ import ( docker "github.com/fsouza/go-dockerclient" - "github.com/gliderlabs/logspout/cfg" + "github.com/gliderlabs/logspout/v3/cfg" ) const ( diff --git a/router/routes.go b/router/routes.go index 156fed8f..130d0cd9 100644 --- a/router/routes.go +++ b/router/routes.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/gliderlabs/logspout/cfg" + "github.com/gliderlabs/logspout/v3/cfg" ) // Routes is all the configured routes diff --git a/routesapi/routesapi.go b/routesapi/routesapi.go index 0928c8d8..df5667d0 100644 --- a/routesapi/routesapi.go +++ b/routesapi/routesapi.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/router" ) func init() { diff --git a/transports/tls/tls.go b/transports/tls/tls.go index 297dfdc6..8f85892b 100644 --- a/transports/tls/tls.go +++ b/transports/tls/tls.go @@ -12,8 +12,8 @@ import ( "os" "strings" - "github.com/gliderlabs/logspout/adapters/raw" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/adapters/raw" + "github.com/gliderlabs/logspout/v3/router" ) const ( diff --git a/transports/udp/udp.go b/transports/udp/udp.go index b960c389..29e3d6e7 100644 --- a/transports/udp/udp.go +++ b/transports/udp/udp.go @@ -3,8 +3,8 @@ package udp import ( "net" - "github.com/gliderlabs/logspout/adapters/raw" - "github.com/gliderlabs/logspout/router" + "github.com/gliderlabs/logspout/v3/adapters/raw" + "github.com/gliderlabs/logspout/v3/router" ) const (