From c106bd73f00a3e157b8ba4f9c2e1dd564992d77b Mon Sep 17 00:00:00 2001 From: Michael Katica Date: Tue, 6 Apr 2021 12:41:15 -0400 Subject: [PATCH 1/4] "con" is reserved path in windows, moving to "global_cfg.go" --- config/con.go | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 config/con.go diff --git a/config/con.go b/config/con.go deleted file mode 100644 index 27284ce..0000000 --- a/config/con.go +++ /dev/null @@ -1,27 +0,0 @@ -// Some constants and globally accessible vars that remain constats once configured -package config - -import ( - log "github.com/Sirupsen/logrus" - "os" -) - -const OK = "OK" -const ERROR = "ERROR" -const NAME = "gremlinproxy" - -var TrackingHeader string -var ProxyFor string - -var GlobalLogger = &log.Logger{ - Out: os.Stderr, - Formatter: new(log.TextFormatter), - Hooks: make(log.LevelHooks), - Level: log.WarnLevel, -} -var ProxyLogger = &log.Logger{ - Out: os.Stderr, - Formatter: new(log.JSONFormatter), - Hooks: make(log.LevelHooks), - Level: log.InfoLevel, -} From 8d361fd3b90020d79950d48313545be30cd40b42 Mon Sep 17 00:00:00 2001 From: Michael Katica Date: Tue, 6 Apr 2021 12:41:23 -0400 Subject: [PATCH 2/4] "con" is reserved path in windows, moving to "global_cfg.go" --- config/global_cfg.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 config/global_cfg.go diff --git a/config/global_cfg.go b/config/global_cfg.go new file mode 100644 index 0000000..27284ce --- /dev/null +++ b/config/global_cfg.go @@ -0,0 +1,27 @@ +// Some constants and globally accessible vars that remain constats once configured +package config + +import ( + log "github.com/Sirupsen/logrus" + "os" +) + +const OK = "OK" +const ERROR = "ERROR" +const NAME = "gremlinproxy" + +var TrackingHeader string +var ProxyFor string + +var GlobalLogger = &log.Logger{ + Out: os.Stderr, + Formatter: new(log.TextFormatter), + Hooks: make(log.LevelHooks), + Level: log.WarnLevel, +} +var ProxyLogger = &log.Logger{ + Out: os.Stderr, + Formatter: new(log.JSONFormatter), + Hooks: make(log.LevelHooks), + Level: log.InfoLevel, +} From 2f78e5f3705c48386f098801fbc424444e15b0a2 Mon Sep 17 00:00:00 2001 From: Michael Katica Date: Tue, 6 Apr 2021 12:50:09 -0400 Subject: [PATCH 3/4] fix logrus import --- config/global_cfg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/global_cfg.go b/config/global_cfg.go index 27284ce..4818ef3 100644 --- a/config/global_cfg.go +++ b/config/global_cfg.go @@ -2,7 +2,7 @@ package config import ( - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "os" ) From 2c38adaa04a95bd06e5e2ae038e0999d90c2d48d Mon Sep 17 00:00:00 2001 From: Michael Katica Date: Tue, 6 Apr 2021 12:52:24 -0400 Subject: [PATCH 4/4] fix another instance of logrus import --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index b01ac7c..b6cf72b 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "net" "os" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) func main() {