Skip to content

Commit 14dfd40

Browse files
Radiokotsimolus3
authored andcommitted
Revert "Get rid of generateLogger()"
This reverts commit 826e7a3.
1 parent 287a337 commit 14dfd40

File tree

3 files changed

+32
-23
lines changed

3 files changed

+32
-23
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
* Fixed modifying severity of the global Kermit logger
66
* Added `PowerSync` tag for the logs
7-
* Removed `generateLogger()` global public method meant to be used internally
87

98
## 1.4.0
109

core/src/commonMain/kotlin/com/powersync/PowerSyncDatabaseFactory.kt

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.powersync
22

3-
import BuildConfig
43
import co.touchlab.kermit.Logger
5-
import co.touchlab.kermit.Severity
6-
import co.touchlab.kermit.StaticConfig
7-
import co.touchlab.kermit.platformLogWriter
84
import co.touchlab.skie.configuration.annotations.DefaultArgumentInterop
95
import com.powersync.db.PowerSyncDatabaseImpl
106
import com.powersync.db.schema.Schema
7+
import com.powersync.utils.generateLogger
118
import kotlinx.coroutines.CoroutineScope
129
import kotlinx.coroutines.DelicateCoroutinesApi
1310
import kotlinx.coroutines.GlobalScope
@@ -30,30 +27,18 @@ public fun PowerSyncDatabase(
3027
* This parameter is ignored for iOS.
3128
*/
3229
dbDirectory: String? = null,
33-
): PowerSyncDatabase =
34-
createPowerSyncDatabaseImpl(
30+
): PowerSyncDatabase {
31+
val generatedLogger: Logger = generateLogger(logger)
32+
33+
return createPowerSyncDatabaseImpl(
3534
schema = schema,
3635
factory = factory,
3736
dbFilename = dbFilename,
3837
scope = scope,
39-
logger =
40-
logger
41-
?: Logger(
42-
config =
43-
StaticConfig(
44-
logWriterList =
45-
listOf(platformLogWriter()),
46-
minSeverity =
47-
if (BuildConfig.isDebug) {
48-
Severity.Verbose
49-
} else {
50-
Severity.Warn
51-
},
52-
),
53-
tag = "PowerSync",
54-
),
38+
logger = generatedLogger,
5539
dbDirectory = dbDirectory,
5640
)
41+
}
5742

5843
internal fun createPowerSyncDatabaseImpl(
5944
factory: DatabaseDriverFactory,
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.powersync.utils
2+
3+
import BuildConfig
4+
import co.touchlab.kermit.*
5+
6+
/*
7+
* Generates a logger with the appropriate severity level based on the build type
8+
* if no Logger is provided.
9+
*/
10+
public fun generateLogger(logger: Logger?): Logger =
11+
logger
12+
?: Logger(
13+
config =
14+
StaticConfig(
15+
logWriterList =
16+
listOf(platformLogWriter()),
17+
minSeverity =
18+
if (BuildConfig.isDebug) {
19+
Severity.Verbose
20+
} else {
21+
Severity.Warn
22+
},
23+
),
24+
tag = "PowerSync",
25+
)

0 commit comments

Comments
 (0)