diff --git a/app/app.go b/app/app.go index e37f3d7..c072afe 100644 --- a/app/app.go +++ b/app/app.go @@ -17,7 +17,7 @@ type Cfg struct { *config.BaseCfg AppType string Home string - Logging *logging.Config + Logging *logging.Cfg } func Start(ctx lib.Context) { diff --git a/examples/demo/etc/etc.go b/examples/demo/etc/etc.go index 686f82f..c0d5764 100644 --- a/examples/demo/etc/etc.go +++ b/examples/demo/etc/etc.go @@ -14,7 +14,7 @@ func Config() lib.Config { BaseCfg: b("dummy", app.Start), Home: ovr(".", HOME), AppType: "standard", - Logging: &logging.Config{ + Logging: &logging.Cfg{ Logfile: ovr("log/scopes.log", LOGFILE), }, } diff --git a/logging/logging.go b/logging/logging.go index 59945f6..917fd4c 100644 --- a/logging/logging.go +++ b/logging/logging.go @@ -4,6 +4,7 @@ import ( "fmt" "path/filepath" + "git.sr.ht/~cco/go-scopes/config" "git.sr.ht/~cco/go-scopes/lib" "github.com/rs/zerolog" "github.com/rs/zerolog/log" @@ -13,12 +14,13 @@ type Logger = zerolog.Logger var globalLogger Logger = log.Logger -type Config struct { +type Cfg struct { + *config.BaseCfg Logfile string Level zerolog.Level } -func Setup(ctx lib.Context, cfg *Config, home string) { +func Setup(ctx lib.Context, cfg *Cfg, home string) { if cfg == nil { return // use unchanged predefined logger } @@ -32,7 +34,7 @@ func Setup(ctx lib.Context, cfg *Config, home string) { fmt.Println("logfile:", fn) } -func New(cfg *Config, home string) *Logger { +func New(cfg *Cfg, home string) *Logger { return nil } diff --git a/tests/etc/etc.go b/tests/etc/etc.go index 135786b..e0d9b43 100644 --- a/tests/etc/etc.go +++ b/tests/etc/etc.go @@ -18,7 +18,7 @@ func Config() lib.Config { BaseCfg: b("testing", testing.Start), Home: ovr(".", HOME), AppType: "standard", - Logging: &logging.Config{ + Logging: &logging.Cfg{ Logfile: ovr("log/scopes.log", LOGFILE), }, }