diff --git a/go.mod b/go.mod index 7cabc2d6..c50df7cc 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/rs/cors v1.11.1 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36 go.uber.org/zap v1.27.0 + go.uber.org/zap/exp v0.3.0 golang.org/x/crypto v0.54.0 golang.org/x/oauth2 v0.36.0 golang.org/x/time v0.15.0 diff --git a/go.sum b/go.sum index e34f571f..d697ebfc 100644 --- a/go.sum +++ b/go.sum @@ -1834,6 +1834,8 @@ go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U= +go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/pkg/challenges/providers/dns01goacme/service_include.go b/pkg/challenges/providers/dns01goacme/service_include.go index 6bdecb45..79062f3d 100644 --- a/pkg/challenges/providers/dns01goacme/service_include.go +++ b/pkg/challenges/providers/dns01goacme/service_include.go @@ -5,9 +5,13 @@ package dns01goacme import ( "certwarden-backend/pkg/datatypes/environment" "fmt" + "log/slog" "os" + "go.uber.org/zap/exp/zapslog" + goacme_dns01 "github.com/go-acme/lego/v5/challenge/dns01" + goacme_log "github.com/go-acme/lego/v5/log" goacme_dns "github.com/go-acme/lego/v5/providers/dns" ) @@ -26,6 +30,14 @@ func NewService(app App, cfg *Config) (*Service, error) { return nil, errServiceComponent } + // set go-acme log to main zap logger + goacme_log.SetDefault(slog.New(zapslog.NewHandler( + service.logger.Desugar().Core(), + zapslog.WithName("go-acme log"), + // WithCaller doesn't work as expected (it always returns `log/logger.go`) + // AddStacktraceAt is unnecessary - already covered by base zap.Logger configuration in main app + ))) + // shutdown context service.shutdownContext = app.GetShutdownContext() diff --git a/pkg/challenges/providers/manager.go b/pkg/challenges/providers/manager.go index 9448ca81..0ecf1691 100644 --- a/pkg/challenges/providers/manager.go +++ b/pkg/challenges/providers/manager.go @@ -4,7 +4,6 @@ import ( "certwarden-backend/pkg/output" "context" "errors" - "log" "net/http" "sync" @@ -50,8 +49,6 @@ func MakeManager(app application, cfg Config) (mgr *Manager, err error) { // add each provider to manager for i := range allCfgs { - log.Println(allCfgs[i].providerCfg) - _, err = mgr.unsafeAddProvider(allCfgs[i].internalCfg, allCfgs[i].providerCfg) if err != nil { return nil, err diff --git a/pkg/domain/app/handlers_logs.go b/pkg/domain/app/handlers_logs.go index 8e25a568..c949ed2e 100644 --- a/pkg/domain/app/handlers_logs.go +++ b/pkg/domain/app/handlers_logs.go @@ -21,7 +21,8 @@ const logEntriesForView = 500 type logEntry struct { Level string `json:"level"` TimeStamp string `json:"ts"` - Caller string `json:"caller"` + Logger string `json:"logger,omitempty"` + Caller string `json:"caller,omitempty"` Message string `json:"msg"` StackTrace string `json:"stacktrace,omitempty"` }