Mercurial > gemma
diff cmd/gemma/main.go @ 5490:5f47eeea988d logging
Use own logging package.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Mon, 20 Sep 2021 17:45:39 +0200 |
parents | fdbc28a71691 |
children | 0cd4ff1066fe |
line wrap: on
line diff
--- a/cmd/gemma/main.go Sat Aug 21 15:01:52 2021 +0200 +++ b/cmd/gemma/main.go Mon Sep 20 17:45:39 2021 +0200 @@ -18,7 +18,7 @@ import ( "context" "fmt" - "log" + lg "log" "net/http" "os" "os/signal" @@ -34,6 +34,7 @@ "gemma.intevation.de/gemma/pkg/controllers" "gemma.intevation.de/gemma/pkg/geoserver" "gemma.intevation.de/gemma/pkg/imports" + "gemma.intevation.de/gemma/pkg/log" "gemma.intevation.de/gemma/pkg/middleware" "gemma.intevation.de/gemma/pkg/scheduler" ) @@ -51,9 +52,16 @@ config.Ready() + if lf := config.LogFile(); lf != "" { + log.SetupLog(lf, 0666) + defer log.ShutdownLog() + } + + log.SetLogLevel(config.LogLevel()) + web, err := filepath.Abs(config.Web()) if err != nil { - log.Fatalf("error: %v\n", err) + log.Fatalf("%v\n", err) } prepareSessionStore() @@ -73,7 +81,7 @@ m.PathPrefix("/").Handler(dir) addr := fmt.Sprintf("%s:%d", config.WebHost(), config.WebPort()) - log.Printf("info: listen on %s\n", addr) + log.Infof("listen on %s\n", addr) var h http.Handler @@ -102,7 +110,7 @@ select { case err := <-done: if err != nil && err != http.ErrServerClosed { - log.Fatalf("error: %v\n", err) + log.Fatalf("%v\n", err) } case <-sigChan: } @@ -112,14 +120,13 @@ <-done if err := auth.Sessions.Shutdown(); err != nil { - log.Fatalf("error: %v\n", err) + log.Fatalf("%v\n", err) } } func main() { config.RootCmd.Run = start - log.SetFlags(log.LstdFlags | log.Lshortfile) if err := config.RootCmd.Execute(); err != nil { - log.Fatalln(err) + lg.Fatalln(err) } }