From 71c0dce1f670293cf5a2f1690515a8b06b7ea3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 2 Jul 2017 10:12:33 -0700 Subject: [PATCH] Vendor renamed Sirupsen/logrus to sirupsen/logrus, fix imports --- alertmanager/models.go | 2 +- alertmanager/upstream.go | 2 +- alertmanager/version.go | 2 +- assets.go | 2 +- config/config.go | 3 ++- filters/filter_test.go | 2 +- main.go | 7 ++++--- timer.go | 2 +- transport/file.go | 2 +- transport/http.go | 2 +- transport/transport_test.go | 2 +- views.go | 3 ++- views_test.go | 4 ++-- 13 files changed, 19 insertions(+), 16 deletions(-) diff --git a/alertmanager/models.go b/alertmanager/models.go index 28f6b2284..19b43d6bb 100644 --- a/alertmanager/models.go +++ b/alertmanager/models.go @@ -13,7 +13,7 @@ import ( "github.com/cloudflare/unsee/transport" "github.com/prometheus/client_golang/prometheus" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) // Alertmanager represents Alertmanager upstream instance diff --git a/alertmanager/upstream.go b/alertmanager/upstream.go index 4f18aa3f0..11f90108c 100644 --- a/alertmanager/upstream.go +++ b/alertmanager/upstream.go @@ -8,7 +8,7 @@ import ( "github.com/cloudflare/unsee/models" "github.com/prometheus/client_golang/prometheus" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) var ( diff --git a/alertmanager/version.go b/alertmanager/version.go index 466879d42..9449bfac0 100644 --- a/alertmanager/version.go +++ b/alertmanager/version.go @@ -5,7 +5,7 @@ import ( "github.com/cloudflare/unsee/transport" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) // AlertmanagerVersion is what api/v1/status returns, we only use it to check diff --git a/assets.go b/assets.go index 574329392..9b2179ea6 100644 --- a/assets.go +++ b/assets.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - log "github.com/Sirupsen/logrus" assetfs "github.com/elazarl/go-bindata-assetfs" + log "github.com/sirupsen/logrus" ) type binaryFileSystem struct { diff --git a/config/config.go b/config/config.go index f6e5aac1e..9ffed4ca0 100644 --- a/config/config.go +++ b/config/config.go @@ -11,8 +11,9 @@ import ( "time" "unicode" - log "github.com/Sirupsen/logrus" "github.com/kelseyhightower/envconfig" + + log "github.com/sirupsen/logrus" ) type spaceSeparatedList []string diff --git a/filters/filter_test.go b/filters/filter_test.go index 7b8e1b74b..cd753a4c8 100644 --- a/filters/filter_test.go +++ b/filters/filter_test.go @@ -9,7 +9,7 @@ import ( "github.com/cloudflare/unsee/filters" "github.com/cloudflare/unsee/models" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) type filterTest struct { diff --git a/main.go b/main.go index 0c9377b0f..f212298d0 100644 --- a/main.go +++ b/main.go @@ -10,13 +10,14 @@ import ( "github.com/cloudflare/unsee/transform" "github.com/DeanThompson/ginpprof" - log "github.com/Sirupsen/logrus" - raven "github.com/getsentry/raven-go" "github.com/gin-contrib/static" "github.com/gin-gonic/contrib/sentry" "github.com/gin-gonic/gin" - ginprometheus "github.com/mcuadros/go-gin-prometheus" "github.com/patrickmn/go-cache" + + raven "github.com/getsentry/raven-go" + ginprometheus "github.com/mcuadros/go-gin-prometheus" + log "github.com/sirupsen/logrus" ) var ( diff --git a/timer.go b/timer.go index 547266095..e62456674 100644 --- a/timer.go +++ b/timer.go @@ -6,7 +6,7 @@ import ( "github.com/cloudflare/unsee/alertmanager" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) func pullFromAlertmanager() { diff --git a/transport/file.go b/transport/file.go index 3d3f9c9db..c1241e3f9 100644 --- a/transport/file.go +++ b/transport/file.go @@ -4,7 +4,7 @@ import ( "io" "os" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) type fileReader struct { diff --git a/transport/http.go b/transport/http.go index d8c13213f..e55467347 100644 --- a/transport/http.go +++ b/transport/http.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) type httpReader struct { diff --git a/transport/transport_test.go b/transport/transport_test.go index 2b78ec670..e1201a5c4 100644 --- a/transport/transport_test.go +++ b/transport/transport_test.go @@ -8,7 +8,7 @@ import ( "github.com/cloudflare/unsee/mock" "github.com/cloudflare/unsee/transport" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" httpmock "gopkg.in/jarcoal/httpmock.v1" ) diff --git a/views.go b/views.go index e4b487472..8bf2f0775 100644 --- a/views.go +++ b/views.go @@ -12,8 +12,9 @@ import ( "github.com/cloudflare/unsee/models" "github.com/cloudflare/unsee/slices" - log "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" + + log "github.com/sirupsen/logrus" ) var ( diff --git a/views_test.go b/views_test.go index c265a1c8a..7a83066e4 100644 --- a/views_test.go +++ b/views_test.go @@ -14,10 +14,10 @@ import ( "github.com/cloudflare/unsee/models" "github.com/cloudflare/unsee/slices" - log "github.com/Sirupsen/logrus" - "github.com/gin-gonic/gin" cache "github.com/patrickmn/go-cache" + log "github.com/sirupsen/logrus" + "github.com/gin-gonic/gin" "gopkg.in/jarcoal/httpmock.v1" )