diff options
Diffstat (limited to 'handlers')
| -rw-r--r-- | handlers/cgit/cgit.go | 8 | ||||
| -rw-r--r-- | handlers/git/git.go | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/handlers/cgit/cgit.go b/handlers/cgit/cgit.go index d971012..261e9a2 100644 --- a/handlers/cgit/cgit.go +++ b/handlers/cgit/cgit.go @@ -5,12 +5,11 @@ package cgit import ( "fmt" - "log" + "log/slog" "net/http" "net/http/cgi" "path/filepath" - "github.com/rs/zerolog" "go.terinstock.com/cgit-httpd/server" ) @@ -19,7 +18,7 @@ type Options struct { ReposRoot string AssetsDir string ConfigFile string - Logger zerolog.Logger + Logger *slog.Logger } type Builder struct { @@ -40,8 +39,7 @@ func New(options Options) *Builder { Env: []string{ fmt.Sprintf("CGIT_CONFIG=%s", options.ConfigFile), }, - Logger: log.New(options.Logger, "", 0), - Stderr: options.Logger.Level(zerolog.ErrorLevel), + Logger: slog.NewLogLogger(options.Logger.Handler(), slog.LevelInfo), }, } } diff --git a/handlers/git/git.go b/handlers/git/git.go index 30e8d8f..5af8428 100644 --- a/handlers/git/git.go +++ b/handlers/git/git.go @@ -5,18 +5,16 @@ package git import ( "fmt" - "log" + "log/slog" "net/http" "net/http/cgi" - - "github.com/rs/zerolog" ) type Options struct { CGI string ReposRoot string ExportAll bool - Logger zerolog.Logger + Logger *slog.Logger } type Builder struct { @@ -42,8 +40,7 @@ func New(options Options) *Builder { Path: options.CGI, Dir: options.ReposRoot, Env: e, - Logger: log.New(options.Logger, "", 0), - Stderr: options.Logger.Level(zerolog.ErrorLevel), + Logger: slog.NewLogLogger(options.Logger.Handler(), slog.LevelInfo), }, } } |