Add flag to log caller

This commit is contained in:
CrazyMax
2019-06-08 03:24:54 +02:00
parent b4e9852821
commit 4564b7f524
3 changed files with 8 additions and 1 deletions

View File

@@ -31,6 +31,7 @@ func main() {
kingpin.Flag("timezone", "Timezone assigned to Diun.").Envar("TZ").Default("UTC").StringVar(&flags.Timezone)
kingpin.Flag("log-level", "Set log level.").Envar("LOG_LEVEL").Default("info").StringVar(&flags.LogLevel)
kingpin.Flag("log-json", "Enable JSON logging output.").Envar("LOG_JSON").Default("false").BoolVar(&flags.LogJson)
kingpin.Flag("log-caller", "Enable to add file:line of the caller.").Envar("LOG_CALLER").Default("false").BoolVar(&flags.LogCaller)
kingpin.Flag("run-startup", "Run on startup.").Envar("RUN_STARTUP").Default("false").BoolVar(&flags.RunStartup)
kingpin.Flag("docker", "Enable Docker mode.").Envar("DOCKER").Default("false").BoolVar(&flags.Docker)
kingpin.UsageTemplate(kingpin.CompactUsageTemplate).Version(version).Author("CrazyMax")

View File

@@ -28,7 +28,12 @@ func Configure(fl *model.Flags, location *time.Location) {
w = os.Stdout
}
log.Logger = zerolog.New(w).With().Caller().Timestamp().Logger()
ctx := zerolog.New(w).With().Timestamp()
if fl.LogCaller {
ctx = ctx.Caller()
}
log.Logger = ctx.Logger()
logLevel, err := zerolog.ParseLevel(fl.LogLevel)
if err != nil {

View File

@@ -7,6 +7,7 @@ type Flags struct {
Timezone string
LogLevel string
LogJson bool
LogCaller bool
RunStartup bool
Docker bool
}