diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-08-20 09:05:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-20 01:05:29 +0000 |
| commit | 79c3329502217b664ef81d3f7f65aaf58282d29d (patch) | |
| tree | 100c0905b8eedbfe2669888434c3068a4fc18129 | |
| parent | f00fdd1abdf8d32acc96546da724946d5d5cb4c5 (diff) | |
| download | gitea-79c3329502217b664ef81d3f7f65aaf58282d29d.tar.gz gitea-79c3329502217b664ef81d3f7f65aaf58282d29d.zip | |
Do not use deprecated log config options by default (#26592)
Simplify the log config
* Remove unnecessary `ROUTER` config, it defaults to the `MODE`.
* `XORM` config was deprecated
| -rw-r--r-- | docker/root/etc/templates/app.ini | 1 | ||||
| -rw-r--r-- | tests/mssql.ini.tmpl | 3 | ||||
| -rw-r--r-- | tests/mysql.ini.tmpl | 3 | ||||
| -rw-r--r-- | tests/mysql8.ini.tmpl | 3 | ||||
| -rw-r--r-- | tests/pgsql.ini.tmpl | 3 | ||||
| -rw-r--r-- | tests/sqlite.ini.tmpl | 3 |
6 files changed, 5 insertions, 11 deletions
diff --git a/docker/root/etc/templates/app.ini b/docker/root/etc/templates/app.ini index 7e8aa0bd0a..01fb407f49 100644 --- a/docker/root/etc/templates/app.ini +++ b/docker/root/etc/templates/app.ini @@ -46,7 +46,6 @@ PATH = /data/gitea/attachments [log] MODE = console LEVEL = info -ROUTER = console ROOT_PATH = /data/gitea/log [security] diff --git a/tests/mssql.ini.tmpl b/tests/mssql.ini.tmpl index 93ade74805..d4562586f6 100644 --- a/tests/mssql.ini.tmpl +++ b/tests/mssql.ini.tmpl @@ -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 diff --git a/tests/mysql.ini.tmpl b/tests/mysql.ini.tmpl index 10aa3cabbe..15a7a379f3 100644 --- a/tests/mysql.ini.tmpl +++ b/tests/mysql.ini.tmpl @@ -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 diff --git a/tests/mysql8.ini.tmpl b/tests/mysql8.ini.tmpl index 6336441741..7d4c27c036 100644 --- a/tests/mysql8.ini.tmpl +++ b/tests/mysql8.ini.tmpl @@ -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 diff --git a/tests/pgsql.ini.tmpl b/tests/pgsql.ini.tmpl index 2b54843c30..ee1373d71c 100644 --- a/tests/pgsql.ini.tmpl +++ b/tests/pgsql.ini.tmpl @@ -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 diff --git a/tests/sqlite.ini.tmpl b/tests/sqlite.ini.tmpl index 546b27c5f6..74e1957113 100644 --- a/tests/sqlite.ini.tmpl +++ b/tests/sqlite.ini.tmpl @@ -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 |