diff options
author | RandomChars <random@chars.jp> | 2021-12-15 11:41:22 +0900 |
---|---|---|
committer | RandomChars <random@chars.jp> | 2021-12-15 11:41:22 +0900 |
commit | 3ce65dd3ae46a907c295bf19ca32322e5e87fe9a (patch) | |
tree | 9a064ea0fec85d5d6343686c27ce0adeb0f721d9 | |
parent | 8c05fe4351cda23e97dd3c016c2d9122a7215e9f (diff) |
fix teardown order, fix logging of undecoded items, use environment variable for gin debug modeHEADmaster
-rw-r--r-- | cleanup.go | 8 | ||||
-rw-r--r-- | config.go | 3 | ||||
-rw-r--r-- | web.go | 13 |
3 files changed, 15 insertions, 9 deletions
@@ -7,13 +7,13 @@ import ( ) func cleanup() { - if err := instance.Close(); err != nil { - log.Printf("error closing instance: %s", err) - } - ctx, cancel := context.WithTimeout(context.Background(), time.Second) defer cancel() if err := server.Shutdown(ctx); err != nil { log.Printf("error shutting down web server: %s", err) } + + if err := instance.Close(); err != nil { + log.Printf("error closing instance: %s", err) + } } @@ -2,7 +2,6 @@ package main import ( "flag" - "fmt" "github.com/BurntSushi/toml" "log" "os" @@ -61,7 +60,7 @@ func confLoad() { return } else { for _, key := range meta.Undecoded() { - fmt.Printf("unused key in configuration file: %s", key.String()) + log.Printf("unused key in configuration file: %s", key.String()) } } } @@ -20,10 +20,17 @@ var ( server = http.Server{} ) -func webSetup() { +func init() { gin.SetMode(gin.ReleaseMode) - if config.System.Verbose { - gin.SetMode(gin.DebugMode) +} + +func webSetup() { + if d, ok := os.LookupEnv("GIN_DEBUG"); ok { + if ginDebug, err := strconv.ParseBool(d); err == nil { + if ginDebug { + gin.SetMode(gin.DebugMode) + } + } } router = gin.New() |