Skip to content

Avoid changing Syncthing's default log level #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenxiaolong merged 1 commit into from
Sep 13, 2026
Merged

Avoid changing Syncthing's default log level #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions app/src/main/java/com/chiller3/basicsync/syncthing/SyncthingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,6 @@ class SyncthingService : Service(), SyncthingStatusReceiver, DeviceStateListener
prefs = Preferences(this)
prefs.registerListener(this)

setLogLevel()

notifications = Notifications(this)

deviceStateTracker = DeviceStateTracker(this)
Expand Down Expand Up @@ -609,10 +607,6 @@ class SyncthingService : Service(), SyncthingStatusReceiver, DeviceStateListener
when (key) {
in BLOCKED_REASONS_PREFS, in DeviceState.PREFS -> recomputeBlockedReasons = true
in STATE_CHANGE_PREFS -> {}
Preferences.PREF_DEBUG_MODE -> {
setLogLevel()
return
}
else -> return
}

Expand All @@ -629,13 +623,6 @@ class SyncthingService : Service(), SyncthingStatusReceiver, DeviceStateListener
}
}

private fun setLogLevel() {
val level = if (prefs.isDebugMode) { "DEBUG" } else { "INFO" }
Log.d(TAG, "Setting Syncthing log level to $level")

Stbridge.setLogLevel(level)
}

private fun stateChanged(
recomputeBlockedReasons: Boolean = false,
forceShowNotification: Boolean = false,
Expand Down
18 changes: 0 additions & 18 deletions stbridge/stbridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"io"
"iter"
"log"
"log/slog"
"net"
_ "net/http"
"os"
Expand Down Expand Up @@ -167,23 +166,6 @@ func applyProxySettings(proxy string, no_proxy string) {
resetProxyConfig()
}

//go:linkname slogutilSetDefaultLevel github.com/syncthing/syncthing/internal/slogutil.SetDefaultLevel
func slogutilSetDefaultLevel(level slog.Level)

// This is thread-safe because syncthing's internal levelTracker.SetDefault() is
// thread-safe.
func SetLogLevel(level string) error {
var slogLevel slog.Level

if err := slogLevel.UnmarshalText([]byte(level)); err != nil {
return fmt.Errorf("invalid log level: %q", level)
}

slogutilSetDefaultLevel(slogLevel)

return nil
}

func InitDirs(filesDir string, cacheDir string, externalDir string) error {
stLock.Lock()
defer stLock.Unlock()
Expand Down