diff --git a/logging/log/log.go b/logging/log/log.go index d992d1f..d8e17b2 100644 --- a/logging/log/log.go +++ b/logging/log/log.go @@ -1,5 +1,18 @@ package log -import "git.sr.ht/~cco/go-scopes/logging" +import ( + "git.sr.ht/~cco/go-scopes/logging" +) -var Info = logging.GetLogger(nil).Info +const ( + DebugLevel = logging.DebugLevel + InfoLevel = logging.InfoLevel +) + +var ( + Debug = logging.GetLogger(nil).Debug + Info = logging.GetLogger(nil).Info + Warn = logging.GetLogger(nil).Warn + Error = logging.GetLogger(nil).Error + Err = logging.GetLogger(nil).Err +) diff --git a/logging/logging.go b/logging/logging.go index db661e9..9fb7bba 100644 --- a/logging/logging.go +++ b/logging/logging.go @@ -1,7 +1,6 @@ package logging import ( - "fmt" "os" "path/filepath" @@ -11,6 +10,11 @@ import ( "github.com/rs/zerolog/log" ) +const ( + DebugLevel = zerolog.DebugLevel + InfoLevel = zerolog.InfoLevel +) + type Logger = zerolog.Logger var globalLogger *Logger = &log.Logger @@ -40,7 +44,6 @@ func New(cfg *Cfg, home string) (*Logger, error) { } else if !filepath.IsAbs(fn) { fn = filepath.Join(home, fn) } - fmt.Println("logfile:", fn) f, err := os.OpenFile(fn, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0664) if err != nil { GetLogger(nil).Err(err).Msg("logging.New: open log file") @@ -55,5 +58,5 @@ func GetLogger(ctx lib.Context) *Logger { return globalLogger } // return ctx.Logger() - return nil + return globalLogger }