fix(logging): debug logs ignored when user enable it (1f608c3a) · Commits · e / os / Mail

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt

+13 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@ import kotlinx.coroutines.flow.update
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.sync.Mutex
		import kotlinx.coroutines.sync.withLock
		import net.thunderbird.core.logging.LogLevel
		import net.thunderbird.core.logging.LogLevelManager
		import net.thunderbird.core.logging.Logger
		import net.thunderbird.core.preference.storage.Storage
		import net.thunderbird.core.preference.storage.StorageEditor
		@@ -20,6 +22,7 @@ class DefaultDebuggingSettingsPreferenceManager(
		private val logger: Logger,
		private val storage: Storage,
		private val storageEditor: StorageEditor,
		private val logLevelManager: LogLevelManager,
		private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
		private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
		) : DebuggingSettingsPreferenceManager {
		@@ -32,7 +35,7 @@ class DefaultDebuggingSettingsPreferenceManager(
		override fun save(config: DebuggingSettings) {
		logger.debug(TAG) { "save() called with: config = $config" }
		writeConfig(config)
		configState.update { config }
		configState.update { config.also(::updateDebugLogLevel) }
		}

		private fun loadConfig(): DebuggingSettings = DebuggingSettings(
		@@ -44,7 +47,7 @@ class DefaultDebuggingSettingsPreferenceManager(
		KEY_ENABLE_SYNC_DEBUG_LOGGING,
		DEBUGGING_SETTINGS_DEFAULT_IS_SYNC_LOGGING_ENABLED,
		),
		)
		).also(::updateDebugLogLevel)

		private fun writeConfig(config: DebuggingSettings) {
		logger.debug(TAG) { "writeConfig() called with: config = $config" }
		@@ -58,4 +61,12 @@ class DefaultDebuggingSettingsPreferenceManager(
		}
		}
		}

		private fun updateDebugLogLevel(config: DebuggingSettings) {
		if (config.isDebugLoggingEnabled) {
		logLevelManager.override(LogLevel.DEBUG)
		} else {
		logLevelManager.restoreDefault()
		}
		}
		}

legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ val preferencesModule = module {
		logger = get(),
		storage = get<Preferences>().storage,
		storageEditor = get<Preferences>().createStorageEditor(),
		logLevelManager = get(),
		)
		}
		single<DebugLogConfigurator> {