"log" import alias was too confusing, changed to "loglib"

log/log.go

@@ -1,7 +1,7 @@
 package log
 
 import (
-	log "github.com/sirupsen/logrus"
+	loglib "github.com/sirupsen/logrus"
 	"io"
 	"io/ioutil"
 	"net"
@@ -52,14 +52,14 @@ func (level Level) String() string {
 }
 
 type Logger interface {
-	log.FieldLogger
-	WithConn(conn net.Conn) *log.Entry
+	loglib.FieldLogger
+	WithConn(conn net.Conn) *loglib.Entry
 	Reopen() error
 	GetLogDest() string
 	SetLevel(level string)
 	GetLevel() string
 	IsDebug() bool
-	AddHook(h log.Hook)
+	AddHook(h loglib.Hook)
 }
 
 // Implements the Logger interface
@@ -67,7 +67,7 @@ type Logger interface {
 type HookedLogger struct {
 
 	// satisfy the log.FieldLogger interface
-	*log.Logger
+	*loglib.Logger
 
 	h LoggerHook
 
@@ -143,8 +143,8 @@ func GetLogger(dest string, level string) (Logger, error) {
 	return l, nil
 }
 
-func newLogrus(o OutputOption, level string) (*log.Logger, error) {
-	logLevel, err := log.ParseLevel(level)
+func newLogrus(o OutputOption, level string) (*loglib.Logger, error) {
+	logLevel, err := loglib.ParseLevel(level)
 	if err != nil {
 		return nil, err
 	}
@@ -163,10 +163,10 @@ func newLogrus(o OutputOption, level string) (*log.Logger, error) {
 		out = ioutil.Discard
 	}
 
-	logger := &log.Logger{
+	logger := &loglib.Logger{
 		Out:       out,
-		Formatter: new(log.TextFormatter),
-		Hooks:     make(log.LevelHooks),
+		Formatter: new(loglib.TextFormatter),
+		Hooks:     make(loglib.LevelHooks),
 		Level:     logLevel,
 	}
 
@@ -174,22 +174,22 @@ func newLogrus(o OutputOption, level string) (*log.Logger, error) {
 }
 
 // AddHook adds a new logrus hook
-func (l *HookedLogger) AddHook(h log.Hook) {
-	log.AddHook(h)
+func (l *HookedLogger) AddHook(h loglib.Hook) {
+	loglib.AddHook(h)
 }
 
 func (l *HookedLogger) IsDebug() bool {
-	return l.GetLevel() == log.DebugLevel.String()
+	return l.GetLevel() == loglib.DebugLevel.String()
 }
 
 // SetLevel sets a log level, one of the LogLevels
 func (l *HookedLogger) SetLevel(level string) {
-	var logLevel log.Level
+	var logLevel loglib.Level
 	var err error
-	if logLevel, err = log.ParseLevel(level); err != nil {
+	if logLevel, err = loglib.ParseLevel(level); err != nil {
 		return
 	}
-	log.SetLevel(logLevel)
+	loglib.SetLevel(logLevel)
 }
 
 // GetLevel gets the current log level
@@ -211,7 +211,7 @@ func (l *HookedLogger) GetLogDest() string {
 }
 
 // WithConn extends logrus to be able to log with a net.Conn
-func (l *HookedLogger) WithConn(conn net.Conn) *log.Entry {
+func (l *HookedLogger) WithConn(conn net.Conn) *loglib.Entry {
 	var addr = "unknown"
 	if conn != nil {
 		addr = conn.RemoteAddr().String()