Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ public actual object KotlinLoggingConfiguration {

@Volatile public actual var loggerFactory: KLoggerFactory = detectLogger()

public actual var logStartupMessage: Boolean = true
public actual var logStartupMessage: Boolean =
System.getProperty("kotlin-logging.logStartupMessage")?.toBoolean()
?: System.getenv("KOTLIN_LOGGING_STARTUP_MESSAGE")?.toBoolean()
?: true

private fun detectLogger(): KLoggerFactory {
if (System.getProperty("kotlin-logging-to-android-native") != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
package io.github.oshai.kotlinlogging

import kotlin.concurrent.AtomicReference
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.cinterop.toKString
import platform.posix.getenv

@OptIn(ExperimentalForeignApi::class)
private fun getEnv(name: String): String? {
return getenv(name)?.toKString()
}

public actual object KotlinLoggingConfiguration {
// Existing Darwin-specific properties
public var subsystem: AtomicReference<String?> = AtomicReference(null)
public var category: AtomicReference<String?> = AtomicReference(null)

private val _logStartupMessage = AtomicReference(true)
private val _logStartupMessage =
AtomicReference(getEnv("KOTLIN_LOGGING_STARTUP_MESSAGE")?.toBoolean() ?: true)
public actual var logStartupMessage: Boolean
get() = _logStartupMessage.value
set(value) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,33 @@
package io.github.oshai.kotlinlogging

private fun resolveStartupMessageDefault(): Boolean {
try {
val disabledInWindow =
js(
"typeof window !== 'undefined' && (window.KOTLIN_LOGGING_STARTUP_MESSAGE === 'false' || window.KOTLIN_LOGGING_STARTUP_MESSAGE === false)"
)
as Boolean
if (disabledInWindow) {
return false
}

val disabledInEnv =
js(
"typeof process !== 'undefined' && process.env && (process.env.KOTLIN_LOGGING_STARTUP_MESSAGE === 'false' || process.env.KOTLIN_LOGGING_STARTUP_MESSAGE === false)"
)
as Boolean
if (disabledInEnv) {
return false
}

return true
} catch (e: Throwable) {
return true
}
}

public actual object KotlinLoggingConfiguration {
public actual var logStartupMessage: Boolean = true
public actual var logStartupMessage: Boolean = resolveStartupMessageDefault()

public actual val direct: DirectLoggingConfiguration =
object : DirectLoggingConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ public actual object KotlinLoggingConfiguration {
*/
@Volatile public actual var loggerFactory: KLoggerFactory = detectLogger()

public actual var logStartupMessage: Boolean = true
public actual var logStartupMessage: Boolean =
System.getProperty("kotlin-logging.logStartupMessage")?.toBoolean()
?: System.getenv("KOTLIN_LOGGING_STARTUP_MESSAGE")?.toBoolean()
?: true

public actual val direct: DirectLoggingConfiguration =
object : DirectLoggingConfiguration {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
package io.github.oshai.kotlinlogging

import kotlin.concurrent.AtomicReference
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.cinterop.toKString
import platform.posix.getenv

@OptIn(ExperimentalForeignApi::class)
private fun getEnv(name: String): String? {
return getenv(name)?.toKString()
}

public actual object KotlinLoggingConfiguration {
public actual val direct: DirectLoggingConfiguration =
Expand Down Expand Up @@ -31,7 +39,8 @@ public actual object KotlinLoggingConfiguration {
}
}

private val _logStartupMessage = AtomicReference(true)
private val _logStartupMessage =
AtomicReference(getEnv("KOTLIN_LOGGING_STARTUP_MESSAGE")?.toBoolean() ?: true)
public actual var logStartupMessage: Boolean
get() = _logStartupMessage.value
set(value) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
package io.github.oshai.kotlinlogging

private fun startupMessageDisabledInWindow(): Boolean =
js(
"typeof window !== 'undefined' && (window.KOTLIN_LOGGING_STARTUP_MESSAGE === 'false' || window.KOTLIN_LOGGING_STARTUP_MESSAGE === false)"
)

private fun startupMessageDisabledInEnv(): Boolean =
js(
"typeof process !== 'undefined' && process.env && (process.env.KOTLIN_LOGGING_STARTUP_MESSAGE === 'false' || process.env.KOTLIN_LOGGING_STARTUP_MESSAGE === false)"
)

private fun resolveStartupMessageDefault(): Boolean {
try {
if (startupMessageDisabledInWindow()) {
return false
}
if (startupMessageDisabledInEnv()) {
return false
}
return true
} catch (e: Throwable) {
return true
}
}

public actual object KotlinLoggingConfiguration {
public actual val direct: DirectLoggingConfiguration =
object : DirectLoggingConfiguration {
Expand Down Expand Up @@ -36,5 +60,5 @@ public actual object KotlinLoggingConfiguration {

public actual var loggerFactory: KLoggerFactory = DirectLoggerFactory

public actual var logStartupMessage: Boolean = true
public actual var logStartupMessage: Boolean = resolveStartupMessageDefault()
}
Loading