|
|
|
@ -122,12 +122,11 @@ func (s *server) serve() int { |
|
|
|
|
go s.serveUntilShutdown() |
|
|
|
|
|
|
|
|
|
for range s.ctx.Done() { |
|
|
|
|
//aforementioned clean shutdown upon main context
|
|
|
|
|
//cancellation
|
|
|
|
|
// aforementioned clean shutdown upon main context
|
|
|
|
|
// cancellation
|
|
|
|
|
} |
|
|
|
|
s.cleanShutdown() |
|
|
|
|
return s.exitCode |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (s *server) cleanupForExit() { |
|
|
|
@ -171,7 +170,7 @@ func (s *server) configure() { |
|
|
|
|
viper.AddConfigPath(fmt.Sprintf("/etc/%s", s.appname)) |
|
|
|
|
// call multiple times to add many search paths:
|
|
|
|
|
viper.AddConfigPath(fmt.Sprintf("$HOME/.config/%s", s.appname)) |
|
|
|
|
//viper.SetEnvPrefix(strings.ToUpper(s.appname))
|
|
|
|
|
// viper.SetEnvPrefix(strings.ToUpper(s.appname))
|
|
|
|
|
viper.AutomaticEnv() |
|
|
|
|
|
|
|
|
|
viper.SetDefault("DEBUG", "false") |
|
|
|
@ -250,7 +249,7 @@ func (s *server) setupLogging() { |
|
|
|
|
logger := zerolog.New(multi).With().Timestamp().Logger().With().Caller().Logger() |
|
|
|
|
|
|
|
|
|
s.log = &logger |
|
|
|
|
//log.Logger = logger
|
|
|
|
|
// log.Logger = logger
|
|
|
|
|
|
|
|
|
|
if viper.GetBool("debug") { |
|
|
|
|
zerolog.SetGlobalLevel(zerolog.DebugLevel) |
|
|
|
|