|
|
@ -231,9 +231,9 @@ func Setup(ctx *cli.Context) error { |
|
|
|
case ctx.Bool(logjsonFlag.Name): |
|
|
|
case ctx.Bool(logjsonFlag.Name): |
|
|
|
// Retain backwards compatibility with `--log.json` flag if `--log.format` not set
|
|
|
|
// Retain backwards compatibility with `--log.json` flag if `--log.format` not set
|
|
|
|
defer log.Warn("The flag '--log.json' is deprecated, please use '--log.format=json' instead") |
|
|
|
defer log.Warn("The flag '--log.json' is deprecated, please use '--log.format=json' instead") |
|
|
|
handler = log.JSONHandler(output) |
|
|
|
handler = log.JSONHandlerWithLevel(output, log.LevelInfo) |
|
|
|
case logFmtFlag == "json": |
|
|
|
case logFmtFlag == "json": |
|
|
|
handler = log.JSONHandler(output) |
|
|
|
handler = log.JSONHandlerWithLevel(output, log.LevelInfo) |
|
|
|
case logFmtFlag == "logfmt": |
|
|
|
case logFmtFlag == "logfmt": |
|
|
|
handler = log.LogfmtHandler(output) |
|
|
|
handler = log.LogfmtHandler(output) |
|
|
|
case logFmtFlag == "", logFmtFlag == "terminal": |
|
|
|
case logFmtFlag == "", logFmtFlag == "terminal": |
|
|
|