Vendored all of logrus

lonelycode · lonelycode · commit d075d26e0bd0 · 2016-12-01T17:18:27.000Z
diff --git a/api.go b/api.go
@@ -17,7 +17,7 @@ import (
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"github.com/nu7hatch/gouuid"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/api_definition_manager.go b/api_definition_manager.go
@@ -14,7 +14,7 @@ import (
 	textTemplate "text/template"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"github.com/rubyist/circuitbreaker"
diff --git a/api_loader.go b/api_loader.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tyk/coprocess"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/mux"
diff --git a/auth_manager.go b/auth_manager.go
@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/base64"
 	"encoding/json"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/nu7hatch/gouuid"
 	"strings"
 	"time"
diff --git a/coprocess.go b/coprocess.go
@@ -6,7 +6,7 @@
 package main
 
 import (
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 	"github.com/mitchellh/mapstructure"
 
diff --git a/coprocess_api.go b/coprocess_api.go
@@ -18,7 +18,7 @@ package main
 import "C"
 
 import (
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 )
 
diff --git a/coprocess_bundle.go b/coprocess_bundle.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/goverify"
 	"github.com/TykTechnologies/tykcommon"
 
diff --git a/coprocess_dummy.go b/coprocess_dummy.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 
 	"github.com/TykTechnologies/tyk/coprocess"
 	"github.com/TykTechnologies/tykcommon"
diff --git a/coprocess_grpc.go b/coprocess_grpc.go
@@ -9,7 +9,7 @@ import (
 	"time"
 	"errors"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tyk/coprocess"
 	"github.com/TykTechnologies/tykcommon"
 	"golang.org/x/net/context"
diff --git a/coprocess_id_extractor.go b/coprocess_id_extractor.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"github.com/mitchellh/mapstructure"
diff --git a/coprocess_lua.go b/coprocess_lua.go
@@ -77,7 +77,7 @@ import (
 	"path/filepath"
 	"unsafe"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tyk/coprocess"
 	"github.com/TykTechnologies/tykcommon"
 )
diff --git a/coprocess_python.go b/coprocess_python.go
@@ -174,7 +174,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tyk/coprocess"
 	"github.com/TykTechnologies/tykcommon"
 )
diff --git a/dashboard_register.go b/dashboard_register.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 )
 
 type NodeResponseOK struct {
diff --git a/distributed_rate_limiter.go b/distributed_rate_limiter.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/drl"
 	"time"
 )
diff --git a/event_handler_webhooks.go b/event_handler_webhooks.go
@@ -5,15 +5,16 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"encoding/json"
-	"github.com/sirupsen/logrus"
-	"github.com/TykTechnologies/tykcommon"
 	"html/template"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"path"
 	"strings"
+
+	"github.com/TykTechnologies/logrus"
+	"github.com/TykTechnologies/tykcommon"
 )
 
 type WebHookRequestMethod string
diff --git a/handler_error.go b/handler_error.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	b64 "encoding/base64"
 	"fmt"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 	"html/template"
 	"net"
diff --git a/handler_websocket.go b/handler_websocket.go
@@ -3,7 +3,7 @@ package main
 import (
 	"crypto/tls"
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"io"
 	"net"
 	"net/http"
diff --git a/host_checker_manager.go b/host_checker_manager.go
@@ -4,7 +4,7 @@ import (
 	b64 "encoding/base64"
 	"encoding/json"
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/lonelycode/go-uuid/uuid"
 	"github.com/TykTechnologies/tykcommon"
 	"gopkg.in/vmihailenco/msgpack.v2"
diff --git a/le_helpers.go b/le_helpers.go
@@ -3,7 +3,7 @@ package main
 import (
 	"rsc.io/letsencrypt"
 	"encoding/json"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 )
 
 const LEKeyPrefix string = "le_ssl:"
diff --git a/main.go b/main.go
@@ -16,14 +16,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sirupsen/logrus"
-	logrus_syslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/TykTechnologies/goagain"
+	"github.com/TykTechnologies/logrus"
+	"github.com/TykTechnologies/logrus-logstash-hook"
+	logrus_syslog "github.com/TykTechnologies/logrus/hooks/syslog"
+	"github.com/TykTechnologies/logrus_sentry"
 	"github.com/TykTechnologies/tykcommon"
 	logger "github.com/TykTechnologies/tykcommon-logger"
-	"github.com/bshuster-repo/logrus-logstash-hook"
 	"github.com/docopt/docopt.go"
-	"github.com/evalphobia/logrus_sentry"
 	"github.com/facebookgo/pidfile"
 	"github.com/gorilla/mux"
 	"github.com/justinas/alice"
diff --git a/middleware_HMAC.go b/middleware_HMAC.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"math"
diff --git a/middleware_access_rights.go b/middleware_access_rights.go
@@ -4,7 +4,7 @@ import "net/http"
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 )
 
diff --git a/middleware_auth_key.go b/middleware_auth_key.go
@@ -5,7 +5,7 @@ import "net/http"
 import (
 	"bytes"
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"io"
diff --git a/middleware_basic_auth_check.go b/middleware_basic_auth_check.go
@@ -5,7 +5,7 @@ import "net/http"
 import (
 	"encoding/base64"
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"golang.org/x/crypto/bcrypt"
diff --git a/middleware_granular_access.go b/middleware_granular_access.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 	"net/http"
 	"regexp"
diff --git a/middleware_jwt.go b/middleware_jwt.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gorilla/context"
diff --git a/middleware_key_expired_check.go b/middleware_key_expired_check.go
@@ -4,7 +4,7 @@ import "net/http"
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 )
 
diff --git a/middleware_oauth2_key_exists.go b/middleware_oauth2_key_exists.go
@@ -4,7 +4,7 @@ import "net/http"
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/gorilla/context"
 	"strings"
diff --git a/middleware_openid.go b/middleware_openid.go
@@ -7,7 +7,7 @@ import (
 	b64 "encoding/base64"
 	"errors"
 	"fmt"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/openid2go/openid"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/dgrijalva/jwt-go"
diff --git a/middleware_organisation_activity.go b/middleware_organisation_activity.go
@@ -8,7 +8,7 @@ import (
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 )
 
 var orgChanMap = make(map[string]chan bool)
diff --git a/middleware_rate_limiting.go b/middleware_rate_limiting.go
@@ -4,7 +4,7 @@ import "net/http"
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 )
 
diff --git a/middleware_request_size_limit.go b/middleware_request_size_limit.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 )
 
diff --git a/middleware_transform.go b/middleware_transform.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/TykTechnologies/tykcommon"
 	"github.com/clbanning/mxj"
 	"github.com/gorilla/context"
diff --git a/multi_target_proxy_handler.go b/multi_target_proxy_handler.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"errors"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"io"
 	"net/http"
 	"net/url"
diff --git a/plugins.go b/plugins.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/gorilla/context"
 	"github.com/mitchellh/mapstructure"
 	"github.com/robertkrimen/otto"
diff --git a/policy.go b/policy.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"gopkg.in/mgo.v2/bson"
 )
 
diff --git a/redis_logrus_hook.go b/redis_logrus_hook.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"time"
 )
 
diff --git a/redis_signal_dash_zeroconf.go b/redis_signal_dash_zeroconf.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"strings"
 	"strconv"
 )
diff --git a/redis_signal_handle_config.go b/redis_signal_handle_config.go
@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"io/ioutil"
 	"time"
 )
diff --git a/redis_signal_handle_config_request.go b/redis_signal_handle_config_request.go
@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"io/ioutil"
 	"time"
 )
diff --git a/redis_signal_handle_reload.go b/redis_signal_handle_reload.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 )
 
 func HandleReloadMsg() {
diff --git a/redis_signal_outbound.go b/redis_signal_outbound.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/sirupsen/logrus"
+	"github.com/TykTechnologies/logrus"
 	"github.com/garyburd/redigo/redis"
 	"time"
 )
diff --git a/redis_signals.go b/redis_signals.go
diff --git a/res_handler_transform.go b/res_handler_transform.go
diff --git a/rpc_analytics_purger.go b/rpc_analytics_purger.go
diff --git a/rpc_backup_handlers.go b/rpc_backup_handlers.go
diff --git a/rpc_storage_handler.go b/rpc_storage_handler.go
diff --git a/tyk_reverse_proxy_clone.go b/tyk_reverse_proxy_clone.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/TykTechnologies/tykcommon"`
`18`	`18`	`"github.com/gorilla/context"`
`19`	`19`	`"github.com/nu7hatch/gouuid"`
`20`		`- "github.com/sirupsen/logrus"`
	`20`	`+ "github.com/TykTechnologies/logrus"`
`21`	`21`	`"golang.org/x/crypto/bcrypt"`
`22`	`22`	`)`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package main`
`18`	`18`	`import "C"`
`19`	`19`
`20`	`20`	`import (`
`21`		`- "github.com/sirupsen/logrus"`
	`21`	`+ "github.com/TykTechnologies/logrus"`
`22`	`22`	`"github.com/TykTechnologies/tykcommon"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ import (`
`77`	`77`	`"path/filepath"`
`78`	`78`	`"unsafe"`
`79`	`79`
`80`		`- "github.com/sirupsen/logrus"`
	`80`	`+ "github.com/TykTechnologies/logrus"`
`81`	`81`	`"github.com/TykTechnologies/tyk/coprocess"`
`82`	`82`	`"github.com/TykTechnologies/tykcommon"`
`83`	`83`	`)`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ import (`
`174`	`174`	`"strings"`
`175`	`175`	`"unsafe"`
`176`	`176`
`177`		`- "github.com/sirupsen/logrus"`
	`177`	`+ "github.com/TykTechnologies/logrus"`
`178`	`178`	`"github.com/TykTechnologies/tyk/coprocess"`
`179`	`179`	`"github.com/TykTechnologies/tykcommon"`
`180`	`180`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"net/http"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "github.com/sirupsen/logrus"`
	`10`	`+ "github.com/TykTechnologies/logrus"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type NodeResponseOK struct {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`		`- "github.com/sirupsen/logrus"`
	`5`	`+ "github.com/TykTechnologies/logrus"`
`6`	`6`	`"github.com/TykTechnologies/drl"`
`7`	`7`	`"time"`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"rsc.io/letsencrypt"`
`5`	`5`	`"encoding/json"`
`6`		`- "github.com/sirupsen/logrus"`
	`6`	`+ "github.com/TykTechnologies/logrus"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const LEKeyPrefix string = "le_ssl:"`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import "net/http"`
`4`	`4`
`5`	`5`	`import (`
`6`	`6`	`"errors"`
`7`		`- "github.com/sirupsen/logrus"`
	`7`	`+ "github.com/TykTechnologies/logrus"`
`8`	`8`	`"github.com/gorilla/context"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"errors"`
`11`		`- "github.com/sirupsen/logrus"`
	`11`	`+ "github.com/TykTechnologies/logrus"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var orgChanMap = make(map[string]chan bool)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`"strconv"`
`7`	`7`
`8`		`- "github.com/sirupsen/logrus"`
	`8`	`+ "github.com/TykTechnologies/logrus"`
`9`	`9`	`"github.com/TykTechnologies/tykcommon"`
`10`	`10`	`)`
`11`	`11`