cmd/loki: minor consistency patch (#6364)

* cmd/loki: minor consistency patch

* cmd/loki: fixed a typo
pull/6368/head
Michael Grigoryan 4 years ago committed by GitHub
parent 9686e4ba30
commit 67ebb0430b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      cmd/loki/main.go

@ -47,22 +47,19 @@ func main() {
// Validate the config once both the config file has been loaded
// and CLI flags parsed.
err := config.Validate()
if err != nil {
if err := config.Validate(); err != nil {
level.Error(util_log.Logger).Log("msg", "validating config", "err", err.Error())
os.Exit(1)
}
if config.PrintConfig {
err := util.PrintConfig(os.Stderr, &config)
if err != nil {
if err := util.PrintConfig(os.Stderr, &config); err != nil {
level.Error(util_log.Logger).Log("msg", "failed to print config to stderr", "err", err.Error())
}
}
if config.LogConfig {
err := util.LogConfig(&config)
if err != nil {
if err := util.LogConfig(&config); err != nil {
level.Error(util_log.Logger).Log("msg", "failed to log config object", "err", err.Error())
}
}
@ -78,13 +75,13 @@ func main() {
if err != nil {
level.Error(util_log.Logger).Log("msg", "error in initializing tracing. tracing will not be enabled", "err", err)
}
defer func() {
if trace != nil {
if err := trace.Close(); err != nil {
level.Error(util_log.Logger).Log("msg", "error closing tracing", "err", err)
}
}
}()
}
@ -96,7 +93,7 @@ func main() {
// Start Loki
t, err := loki.New(config.Config)
util_log.CheckFatal("initialising loki", err, util_log.Logger)
util_log.CheckFatal("initializing loki", err, util_log.Logger)
if config.ListTargets {
t.ListTargets()

Loading…
Cancel
Save