diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f8c327d..ce90288b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +* Fixed modifying severity of the global Kermit logger +* Added `PowerSync` tag for the logs +* Removed `generateLogger()` global public method meant to be used internally + ## 1.4.0 * Added the ability to log PowerSync service HTTP request information via specifying a diff --git a/core/src/commonMain/kotlin/com/powersync/PowerSyncDatabaseFactory.kt b/core/src/commonMain/kotlin/com/powersync/PowerSyncDatabaseFactory.kt index bd6fc453..51b28ffd 100644 --- a/core/src/commonMain/kotlin/com/powersync/PowerSyncDatabaseFactory.kt +++ b/core/src/commonMain/kotlin/com/powersync/PowerSyncDatabaseFactory.kt @@ -1,10 +1,13 @@ package com.powersync +import BuildConfig import co.touchlab.kermit.Logger +import co.touchlab.kermit.Severity +import co.touchlab.kermit.StaticConfig +import co.touchlab.kermit.platformLogWriter import co.touchlab.skie.configuration.annotations.DefaultArgumentInterop import com.powersync.db.PowerSyncDatabaseImpl import com.powersync.db.schema.Schema -import com.powersync.utils.generateLogger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope @@ -27,18 +30,28 @@ public fun PowerSyncDatabase( * This parameter is ignored for iOS. */ dbDirectory: String? = null, -): PowerSyncDatabase { - val generatedLogger: Logger = generateLogger(logger) - - return createPowerSyncDatabaseImpl( +): PowerSyncDatabase = + createPowerSyncDatabaseImpl( schema = schema, factory = factory, dbFilename = dbFilename, scope = scope, - logger = generatedLogger, + logger = + logger + ?: Logger( + config = StaticConfig( + logWriterList = + listOf(platformLogWriter()), + minSeverity = + if (BuildConfig.isDebug) + Severity.Verbose + else + Severity.Warn, + ), + tag = "PowerSync", + ), dbDirectory = dbDirectory, ) -} internal fun createPowerSyncDatabaseImpl( factory: DatabaseDriverFactory, diff --git a/core/src/commonMain/kotlin/com/powersync/utils/Log.kt b/core/src/commonMain/kotlin/com/powersync/utils/Log.kt deleted file mode 100644 index 53a1eb4e..00000000 --- a/core/src/commonMain/kotlin/com/powersync/utils/Log.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.powersync.utils - -import co.touchlab.kermit.Logger -import co.touchlab.kermit.Severity - -/* - * Generates a logger with the appropriate severity level based on the build type - * if no Logger is provided. -*/ -public fun generateLogger(logger: Logger?): Logger { - if (logger != null) { - return logger - } - - val defaultLogger: Logger = Logger - - if (BuildConfig.isDebug) { - Logger.setMinSeverity(Severity.Verbose) - } else { - Logger.setMinSeverity(Severity.Warn) - } - - return defaultLogger -}