From 775a5a5b0f4c1a7aa7b301569fe89d7c6e751c46 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 15 May 2019 22:37:06 +0100 Subject: [PATCH] Stop colorizing files by default (#6949) --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 3 +-- docs/content/doc/advanced/logging-documentation.en-us.md | 3 +-- modules/setting/log.go | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 6b209b97b..f40d35cdb 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -334,7 +334,7 @@ NB: You must `REDIRECT_MACARON_LOG` and have `DISABLE_ROUTER_LOG` set to `false` ### Console log mode (`log.console`, `log.console.*`, or `MODE=console`) -- For the console logger `COLORIZE` will default to `true` if not on windows. +- For the console logger `COLORIZE` will default to `true` if not on windows or the terminal is determined to be able to color. - `STDERR`: **false**: Use Stderr instead of Stdout. ### File log mode (`log.file`, `log.file.*` or `MODE=file`) @@ -344,7 +344,6 @@ NB: You must `REDIRECT_MACARON_LOG` and have `DISABLE_ROUTER_LOG` set to `false` - `MAX_SIZE_SHIFT`: **28**: Maximum size shift of a single file, 28 represents 256Mb. - `DAILY_ROTATE`: **true**: Rotate logs daily. - `MAX_DAYS`: **7**: Delete the log file after n days -- NB: `COLORIZE`: will default to `true` if not on windows. - `COMPRESS`: **true**: Compress old log files by default with gzip - `COMPRESSION_LEVEL`: **-1**: Compression level diff --git a/docs/content/doc/advanced/logging-documentation.en-us.md b/docs/content/doc/advanced/logging-documentation.en-us.md index d9a21affc..df3578694 100644 --- a/docs/content/doc/advanced/logging-documentation.en-us.md +++ b/docs/content/doc/advanced/logging-documentation.en-us.md @@ -213,7 +213,7 @@ from `[log.sublogger]`. a stacktrace. This value is inherited. * `MODE` is the mode of the log output. It will default to the sublogger name. Thus `[log.console.macaron]` will default to `MODE = console`. -* `COLORIZE` will default to `true` for `file` and `console` as +* `COLORIZE` will default to `true` for `console` as described, otherwise it will default to `false`. ### Non-inherited default values @@ -274,7 +274,6 @@ Other values: * `MAX_SIZE_SHIFT`: **28**: Maximum size shift of a single file, 28 represents 256Mb. * `DAILY_ROTATE`: **true**: Rotate logs daily. * `MAX_DAYS`: **7**: Delete the log file after n days -* NB: `COLORIZE`: will default to `true` if not on windows. * `COMPRESS`: **true**: Compress old log files by default with gzip * `COMPRESSION_LEVEL`: **-1**: Compression level diff --git a/modules/setting/log.go b/modules/setting/log.go index 43a28309d..9f4bbf9d8 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -10,7 +10,6 @@ import ( "os" "path" "path/filepath" - "runtime" "strings" "code.gitea.io/gitea/modules/log" @@ -113,7 +112,6 @@ func generateLogConfig(sec *ini.Section, name string, defaults defaultLogOptions panic(err.Error()) } - logConfig["colorize"] = sec.Key("COLORIZE").MustBool(runtime.GOOS != "windows") logConfig["filename"] = logPath logConfig["rotate"] = sec.Key("LOG_ROTATE").MustBool(true) logConfig["maxsize"] = 1 << uint(sec.Key("MAX_SIZE_SHIFT").MustInt(28))