This commit is contained in:
2022-06-09 16:29:56 +06:00
parent 10576d32f6
commit de7f735ad0
9 changed files with 111 additions and 72 deletions

View File

@@ -3,26 +3,36 @@ package dev.inmo.kslog.common
import java.util.logging.Level
import java.util.logging.Logger
private val defaultKSLogLogger by lazy {
Logger.getLogger("KSLog")
}
private fun Logger.doLog(
l: LogLevel, t: String, m: String, e: Throwable?
) = log(
when(l) {
LogLevel.DEBUG -> Level.FINEST
LogLevel.VERBOSE -> Level.FINE
LogLevel.INFO -> Level.INFO
LogLevel.WARNING -> Level.WARNING
LogLevel.ERROR -> Level.SEVERE
LogLevel.ASSERT -> Level.SEVERE
},
m,
e
)
internal actual val defaultLogging: (level: LogLevel, tag: String, message: String, throwable: Throwable?) -> Unit = { l, t, m, e ->
defaultKSLogLogger.doLog(l, t, m, e)
}
fun KSLog(
defaultTag: String,
logger: Logger,
filter: MessageFilter = { _, _, _, _ -> true },
filter: MessageFilter = { _, _, _ -> true },
messageFormatter: MessageFormatter = defaultMessageFormatter
) = KSLog { l, t, m, e ->
if (!filter(l, t, m, e)) return@KSLog
if (!filter(l, t, e)) return@KSLog
val text = messageFormatter(l,t ?: defaultTag,m,e)
logger.log(
when(l) {
LogLevel.DEBUG -> Level.FINEST
LogLevel.VERBOSE -> Level.FINE
LogLevel.INFO -> Level.INFO
LogLevel.WARNING -> Level.WARNING
LogLevel.ERROR -> Level.SEVERE
LogLevel.ASSERT -> Level.SEVERE
},
text,
e
)
logger.doLog(l, t ?: defaultTag, text, e)
}
fun KSLog(
@@ -32,7 +42,7 @@ fun KSLog(
messageFormatter: MessageFormatter = defaultMessageFormatter
): KSLog {
val levels = levels.toSet()
return KSLog (defaultTag, logger, { l, _, _, _ ->
return KSLog (defaultTag, logger, { l, _, _ ->
l in levels
}, messageFormatter)
}
@@ -51,12 +61,6 @@ fun KSLog(
logger: Logger,
minLoggingLevel: LogLevel = LogLevel.values().first(),
messageFormatter: MessageFormatter = defaultMessageFormatter
): KSLog = KSLog (defaultTag, logger, { l, _, _, _ ->
): KSLog = KSLog (defaultTag, logger, { l, _, _ ->
minLoggingLevel.ordinal <= l.ordinal
}, messageFormatter)
actual fun KSLog(
defaultTag: String,
filter: MessageFilter,
messageFormatter: MessageFormatter
): KSLog = KSLog(defaultTag, Logger.getLogger("KSLog"), filter, messageFormatter)