Skip to content

OSLogWriter structured logging takes optional subsystem and category #409

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
KevinSchildhorn merged 2 commits into from
Nov 15, 2024
+6 −6
Merged

OSLogWriter structured logging takes optional subsystem and category #409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f6fca
OSLogWriter takes optional subsystem and category
rocketraman Nov 6, 2024
1eaca03
Merge branch 'main' into pr/409
KevinSchildhorn Nov 13, 2024
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
12 changes: 6 additions & 6 deletions kermit-core/src/appleMain/kotlin/co/touchlab/kermit/OSLogWriter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import kotlin.experimental.ExperimentalNativeApi
*/
open class OSLogWriter internal constructor(
private val messageStringFormatter: MessageStringFormatter,
private val darwinLogger: DarwinLogger
private val darwinLogger: DarwinLogger,
) : LogWriter() {

constructor(messageStringFormatter: MessageStringFormatter = DefaultFormatter) : this(
constructor(messageStringFormatter: MessageStringFormatter = DefaultFormatter, subsystem: String = "", category: String = "") : this(
messageStringFormatter,
DarwinLoggerActual
DarwinLoggerActual(subsystem, category),
)

override fun log(severity: Severity, message: String, tag: String, throwable: Throwable?) {
Expand Down Expand Up @@ -77,9 +77,9 @@ internal interface DarwinLogger {
}

@OptIn(ExperimentalForeignApi::class)
private object DarwinLoggerActual : DarwinLogger {
private val logger = darwin_log_create("", "")!!
private class DarwinLoggerActual(subsystem: String, category: String) : DarwinLogger {
private val logger = darwin_log_create(subsystem, category)!!
override fun log(osLogSeverity: os_log_type_t, message: String) {
darwin_log_with_type(logger, osLogSeverity, message)
}
}
}