temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-01 01:44:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/improve server config non privacy safe setting handling (#1794)

Browse Source 
* Move the "group" arg at the second position after "protoNumber"

To make it consistent for all settings

* Improve server config non privacy safe setting handling

---------

Co-authored-by: Mitchell Syer <Syer10@users.noreply.github.com>
This commit is contained in:
schroda
2025-11-26 03:58:00 +01:00
committed by GitHub
parent aa8d27f679
commit 9d7f54be82
5 changed files with 182 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
View File

@@ -272,13 +272,15 @@ fun applicationSetup() {
logger.debug {
"Loaded config:\n" +
GlobalConfigManager.config
.root()
GlobalConfigManager
.getRedactedConfig(
SettingsRegistry
.getAll()
.filter { !it.value.privacySafe }
.keys
.toList(),
).root()
.render(ConfigRenderOptions.concise().setFormatted(true))
.replace(
Regex("(\".*(?i:username|password).*\"\\s:\\s)\".*\""),
"$1\"[REDACTED]\"",
)
}
logger.debug { "Data Root directory is set to: ${applicationDirs.dataRoot}" }
@@ -409,9 +411,9 @@ fun applicationSetup() {
vargs[4] as Boolean,
)
}.distinctUntilChanged(),
{ (databaseType, databaseUrl, databaseUsername, _, hikariCp) ->
{ (databaseType, databaseUrl, _databaseUsername, _databasePassword, hikariCp) ->
logger.info {
"Database changed - type=$databaseType url=$databaseUrl, username=$databaseUsername, password=[REDACTED], hikaricp=$hikariCp"
"Database changed - type=$databaseType url=$databaseUrl, username=[REDACTED], password=[REDACTED], hikaricp=$hikariCp"
}
databaseUp()
@@ -464,7 +466,7 @@ fun applicationSetup() {
}.distinctUntilChanged(),
{ (proxyEnabled, proxyVersion, proxyHost, proxyPort, proxyUsername, proxyPassword) ->
logger.info {
"Socks Proxy changed - enabled=$proxyEnabled address=$proxyHost:$proxyPort , username=$proxyUsername, password=[REDACTED]"
"Socks Proxy changed - enabled=$proxyEnabled address=$proxyHost:$proxyPort , username=[REDACTED], password=[REDACTED]"
}
if (proxyEnabled) {
System.setProperty("socksProxyHost", proxyHost)