WORKING FIX

This commit is contained in:
Haris Khan
2024-10-16 11:23:49 -04:00
parent 4e1b426230
commit aa63210c3c
3 changed files with 43 additions and 23 deletions

61
log.go
View File

@ -5,31 +5,46 @@ import (
"io/ioutil"
"os"
"strings"
"sync"
)
var log *logrus.Logger
var (
log *logrus.Logger
once sync.Once
)
func InitializeLogger() {
once.Do(func() {
log = logrus.New()
// We do not want to log by default
log.SetOutput(ioutil.Discard)
log.SetLevel(logrus.PanicLevel)
// Check if DEBUG_I2P is set
if logLevel := os.Getenv("DEBUG_I2P"); logLevel != "" {
log.SetOutput(os.Stdout)
switch strings.ToLower(logLevel) {
case "debug":
log.SetLevel(logrus.DebugLevel)
case "warn":
log.SetLevel(logrus.WarnLevel)
case "error":
log.SetLevel(logrus.ErrorLevel)
default:
log.SetLevel(logrus.DebugLevel)
}
log.WithField("level", log.GetLevel()).Debug("Logging enabled.")
}
})
}
// GetLogger returns the initialized logger
func GetLogger() *logrus.Logger {
if log == nil {
InitializeLogger()
}
return log
}
func init() {
log = logrus.New()
// We do not want to log by default
log.SetOutput(ioutil.Discard)
log.SetLevel(logrus.PanicLevel)
// Check if DEBUG_I2P is set
if logLevel := os.Getenv("DEBUG_I2P"); logLevel != "" {
log.SetOutput(os.Stdout)
switch strings.ToLower(logLevel) {
case "debug":
log.SetLevel(logrus.DebugLevel)
case "warn":
log.SetLevel(logrus.WarnLevel)
case "error":
log.SetLevel(logrus.ErrorLevel)
default:
log.SetLevel(logrus.DebugLevel)
}
log.WithField("level", log.GetLevel()).Debug("Logging enabled.")
}
InitializeLogger()
}

View File

@ -18,6 +18,10 @@ import (
. "github.com/eyedeekay/i2pkeys"
)
func init() {
InitializeLogger()
}
// Used for controlling I2Ps SAMv3.
type SAM struct {
address string

View File

@ -99,6 +99,7 @@ func PrimarySessionString() string {
var PrimarySessionSwitch string = PrimarySessionString()
func getEnv(key, fallback string) string {
InitializeLogger()
value, ok := os.LookupEnv(key)
if !ok {
log.WithFields(logrus.Fields{