thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Do not use deprecated log config options by default (#26592) (#26600)

Browse source 
Backport #26592 by @wxiaoguang

Simplify the log config

* Remove unnecessary `ROUTER` config, it defaults to the `MODE`.
* `XORM` config was deprecated

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit b643b2ca9c)
This commit is contained in:
Giteabot 2023-08-20 16:11:57 +08:00 committed by Earl Warren
parent 28acd6e262
commit 98820fe4f2
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
6 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docker/root/etc/templates/app.ini
View file

@ -46,7 +46,6 @@ PATH = /data/gitea/attachments
[log] [log]
MODE = console MODE = console
LEVEL = info LEVEL = info
ROUTER = console
ROOT_PATH = /data/gitea/log ROOT_PATH = /data/gitea/log
[security] [security]

3
tests/mssql.ini.tmpl
View file

@ -86,9 +86,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mssql/data/sessions
[log] [log]
MODE = {{TEST_LOGGER}} MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}mssql-log ROOT_PATH = {{REPO_TEST_DIR}}mssql-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true ENABLE_SSH_LOG = true
logger.xorm.MODE = file
[log.test] [log.test]
LEVEL = Info LEVEL = Info

3
tests/mysql.ini.tmpl
View file

@ -84,9 +84,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mysql/data/sessions
[log] [log]
MODE = {{TEST_LOGGER}} MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}mysql-log ROOT_PATH = {{REPO_TEST_DIR}}mysql-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true ENABLE_SSH_LOG = true
logger.xorm.MODE = file
[log.test] [log.test]
LEVEL = Info LEVEL = Info

3
tests/mysql8.ini.tmpl
View file

@ -83,9 +83,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mysql8/data/sessions
[log] [log]
MODE = {{TEST_LOGGER}} MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}mysql8-log ROOT_PATH = {{REPO_TEST_DIR}}mysql8-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true ENABLE_SSH_LOG = true
logger.xorm.MODE = file
[log.test] [log.test]
LEVEL = Info LEVEL = Info

3
tests/pgsql.ini.tmpl
View file

@ -87,9 +87,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-pgsql/data/sessions
[log] [log]
MODE = {{TEST_LOGGER}} MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}pgsql-log ROOT_PATH = {{REPO_TEST_DIR}}pgsql-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true ENABLE_SSH_LOG = true
logger.xorm.MODE = file
[log.test] [log.test]
LEVEL = Info LEVEL = Info

3
tests/sqlite.ini.tmpl
View file

@ -82,9 +82,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-sqlite/data/sessions
[log] [log]
MODE = {{TEST_LOGGER}} MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}sqlite-log ROOT_PATH = {{REPO_TEST_DIR}}sqlite-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true ENABLE_SSH_LOG = true
logger.xorm.MODE = file
[log.test] [log.test]
LEVEL = Info LEVEL = Info