Skip to content

Commit

Permalink
Do not use deprecated log config options by default (#26592) (#26600)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
GiteaBot and wxiaoguang committed Aug 20, 2023
1 parent 94f8696 commit b643b2c
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 11 deletions.
1 change: 0 additions & 1 deletion docker/root/etc/templates/app.ini
Expand Up @@ -46,7 +46,6 @@ PATH = /data/gitea/attachments
[log]
MODE = console
LEVEL = info
ROUTER = console
ROOT_PATH = /data/gitea/log

[security]
Expand Down
3 changes: 1 addition & 2 deletions tests/mssql.ini.tmpl
Expand Up @@ -86,9 +86,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mssql/data/sessions
[log]
MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}mssql-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true
logger.xorm.MODE = file

[log.test]
LEVEL = Info
Expand Down
3 changes: 1 addition & 2 deletions tests/mysql.ini.tmpl
Expand Up @@ -84,9 +84,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mysql/data/sessions
[log]
MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}mysql-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true
logger.xorm.MODE = file

[log.test]
LEVEL = Info
Expand Down
3 changes: 1 addition & 2 deletions tests/mysql8.ini.tmpl
Expand Up @@ -83,9 +83,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mysql8/data/sessions
[log]
MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}mysql8-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true
logger.xorm.MODE = file

[log.test]
LEVEL = Info
Expand Down
3 changes: 1 addition & 2 deletions tests/pgsql.ini.tmpl
Expand Up @@ -87,9 +87,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-pgsql/data/sessions
[log]
MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}pgsql-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true
logger.xorm.MODE = file

[log.test]
LEVEL = Info
Expand Down
3 changes: 1 addition & 2 deletions tests/sqlite.ini.tmpl
Expand Up @@ -82,9 +82,8 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-sqlite/data/sessions
[log]
MODE = {{TEST_LOGGER}}
ROOT_PATH = {{REPO_TEST_DIR}}sqlite-log
ROUTER = ,
XORM = file
ENABLE_SSH_LOG = true
logger.xorm.MODE = file

[log.test]
LEVEL = Info
Expand Down

0 comments on commit b643b2c

Please sign in to comment.