diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -5,6 +5,7 @@ package main import ( "flag" + "log/slog" "net" "net/http" "net/http/pprof" @@ -13,7 +14,6 @@ import ( "time" "github.com/gorilla/mux" - "github.com/rs/zerolog" "go.terinstock.com/cgit-httpd/handlers/cgit" "go.terinstock.com/cgit-httpd/handlers/git" "go.terinstock.com/cgit-httpd/manager" @@ -27,14 +27,16 @@ func main() { flag.StringVar(&configFile, "config", "./config.edn", "path to cgit-httpd configuration file") flag.Parse() - logger := zerolog.New(os.Stdout).With().Logger() + logger := slog.New(slog.NewTextHandler(os.Stderr, nil)) + slog.SetDefault(logger) cfg, err := readConfig(configFile) if err != nil { - logger.Fatal().Err(err).Send() + logger.Error("could not parse config", "error", err) + os.Exit(1) } - logger.Info().Interface("config", cfg).Send() + logger.Info("", "config", cfg) gitMux := mux.NewRouter() @@ -43,7 +45,7 @@ func main() { ReposRoot: cfg.ReposRoot, AssetsDir: cfg.CGit.AssetsDir, ConfigFile: cfg.CGit.ConfigFile, - Logger: logger.With().Str("handler", "cgit").Logger(), + Logger: logger.With("handler", "cgit"), }). WithRegister(RegistererFunc(gitMux.Handle)). Build() @@ -52,7 +54,7 @@ func main() { CGI: cfg.Git.CGI, ReposRoot: cfg.ReposRoot, ExportAll: cfg.Git.ExportAll, - Logger: logger.With().Str("handler", "git").Logger(), + Logger: logger.With("handler", "git"), }). WithRegister(RegistererFunc(gitMux.Handle)). Build() @@ -88,7 +90,7 @@ func main() { } if err := m.Start(signals.SetupSignalHandler()); err != nil { - logger.Info().Err(err).Msg("manager stopped") + logger.Info("manager stopped", "error", err) } } |