fix logger naming collision with other libs

lib/common/certificate/certificate.go

@@ -13,7 +13,7 @@ import (
 	. "github.com/go-i2p/go-i2p/lib/common/data"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // Certificate Types
 const (

lib/common/data/date.go

@@ -9,7 +9,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // DATE_SIZE is the length in bytes of an I2P Date.
 const DATE_SIZE = 8

lib/common/destination/destination.go

@@ -14,7 +14,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/crypto"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 /*
 [Destination]

lib/common/key_certificate/key_certificate.go

@@ -38,7 +38,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/crypto"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // Key Certificate Signing Key Types
 const (

lib/common/keys_and_cert/keys_and_cert.go

@@ -12,7 +12,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // Sizes of various KeysAndCert structures and requirements
 const (

lib/common/lease_set/lease_set.go

@@ -17,7 +17,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/crypto"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // Sizes of various structures in an I2P LeaseSet
 const (

lib/common/router_address/router_address.go

@@ -19,7 +19,7 @@ const (
 	ROUTER_ADDRESS_MIN_SIZE = 9
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 /*
 [RouterAddress]

lib/common/router_identity/router_identity.go

@@ -7,7 +7,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 /*
 [RouterIdentity]

lib/common/router_info/router_info.go

@@ -15,7 +15,7 @@ import (
 	. "github.com/go-i2p/go-i2p/lib/common/signature"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 const ROUTER_INFO_MIN_SIZE = 439
 

lib/common/session_tag/session_tag.go

@@ -6,7 +6,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 /*
 [SessionKey]

lib/common/signature/signature.go

@@ -6,7 +6,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // Lengths of signature keys
 const (

lib/crypto/aes.go

@@ -10,7 +10,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // AESSymmetricKey represents a symmetric key for AES encryption/decryption
 type AESSymmetricKey struct {

lib/i2np/build_request_record.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/util/logger"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 /*
 I2P I2NP BuildRequestRecord

lib/netdb/reseed/reseed.go

@@ -18,7 +18,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/su3"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 const (
 	I2pUserAgent = "Wget/1.11.4"

lib/netdb/std.go

@@ -21,7 +21,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/util"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // standard network database implementation using local filesystem skiplist
 type StdNetDB struct {

lib/router/router.go

@@ -10,7 +10,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/netdb"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // i2p router type
 type Router struct {

lib/su3/su3.go

@@ -83,7 +83,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 type SignatureType string
 

lib/transport/multi.go

@@ -6,7 +6,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/util/logger"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 // muxes multiple transports into 1 Transport
 // implements transport.Transport

lib/transport/noise/handshake.go

@@ -8,7 +8,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/common/router_info"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 func (c *NoiseTransport) Handshake(routerInfo router_info.RouterInfo) error {
 	log.WithField("router_info", routerInfo.IdentHash()).Debug("Starting Noise handshake")

lib/tunnel/delivery.go

@@ -9,7 +9,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 /*
 I2P First Fragment Delivery Instructions

lib/util/logger/log.go

@@ -14,7 +14,7 @@ var (
 	once sync.Once
 )
 
-func InitializeLogger() {
+func InitializeGoI2PLogger() {
 	once.Do(func() {
 		log = logrus.New()
 		// We do not want to log by default
@@ -38,14 +38,14 @@ func InitializeLogger() {
 	})
 }
 
-// GetLogger returns the initialized logger
-func GetLogger() *logrus.Logger {
+// GetGoI2PLogger returns the initialized logger
+func GetGoI2PLogger() *logrus.Logger {
 	if log == nil {
-		InitializeLogger()
+		InitializeGoI2PLogger()
 	}
 	return log
 }
 
 func init() {
-	InitializeLogger()
+	InitializeGoI2PLogger()
 }

main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/go-i2p/go-i2p/lib/util/signals"
 )
 
-var log = logger.GetLogger()
+var log = logger.GetGoI2PLogger()
 
 func main() {
 	netDbPath := flag.String("netDb", config.DefaultNetDbConfig.Path, "Path to the netDb")