Stop colorizing files by default (#6949)

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 6b209b97bb603382262070ad20ea3219c62680c9..f40d35cdbabd2d10b9d823897a274e437a1807c8 100644 (file)
--- 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 d9a21affce28f3f79172e29a36bf49198f3d6c63..df3578694346f42be167e70473545ebe39ade494 100644 (file)
--- 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 43a28309d26ddb511e4d74fbecbb5e721a27cfb7..9f4bbf9d87d4b4b37bbdc2b5ac6b62cbfd559ef6 100644 (file)
--- 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))