diff --git a/config.go b/config.go index 5d2d6498..1980405a 100644 --- a/config.go +++ b/config.go @@ -25,8 +25,6 @@ var lookupPaths = []string{"", "./config", "/config", "../", "../config", "../.. var ConfigName = "database.yml" func init() { - SetLogger(defaultLogger) - ap := os.Getenv("APP_PATH") if ap != "" { _ = AddLookupPaths(ap) diff --git a/logger.go b/logger.go index 3c0c213a..a6ab010f 100644 --- a/logger.go +++ b/logger.go @@ -9,18 +9,20 @@ import ( "github.com/gobuffalo/pop/v6/logging" ) -type logger func(lvl logging.Level, s string, args ...interface{}) - // Debug mode, to toggle verbose log traces var Debug = false // Color mode, to toggle colored logs var Color = true -var log logger +// SetLogger overrides the default logger. +func SetLogger(logger func(level logging.Level, s string, args ...interface{})) { + log = logger +} + +var defaultStdLogger = stdlog.New(os.Stderr, "[POP] ", stdlog.LstdFlags) -var defaultStdLogger = stdlog.New(os.Stdout, "[POP] ", stdlog.LstdFlags) -var defaultLogger = func(lvl logging.Level, s string, args ...interface{}) { +var log = func(lvl logging.Level, s string, args ...interface{}) { if !Debug && lvl <= logging.Debug { return } @@ -48,11 +50,3 @@ var defaultLogger = func(lvl logging.Level, s string, args ...interface{}) { } defaultStdLogger.Println(s) } - -// SetLogger overrides the default logger. -// -// The logger must implement the following interface: -// type logger func(lvl logging.Level, s string, args ...interface{}) -func SetLogger(l logger) { - log = l -}