From 2c8fde0db89ae5e640ef9613119fda155710aca3 Mon Sep 17 00:00:00 2001 From: rnentjes Date: Sun, 27 Oct 2024 10:57:35 +0100 Subject: [PATCH] Version. 1.0.1 --- build.gradle.kts | 2 +- .../kotlin/nl/astraeus/logger/Logger.kt | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b5d6c38..b902dd0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "nl.astraeus" -version = "1.0.1-SNAPSHOT" +version = "1.0.1" repositories { mavenCentral() diff --git a/src/commonMain/kotlin/nl/astraeus/logger/Logger.kt b/src/commonMain/kotlin/nl/astraeus/logger/Logger.kt index a25e17f..a69dcd8 100644 --- a/src/commonMain/kotlin/nl/astraeus/logger/Logger.kt +++ b/src/commonMain/kotlin/nl/astraeus/logger/Logger.kt @@ -21,24 +21,24 @@ class Logger( ) { - fun trace(message: () -> String) = log(LogLevel.TRACE, null, message) - fun debug(message: () -> String) = log(LogLevel.DEBUG, null, message) - fun info(message: () -> String) = log(LogLevel.INFO, null, message) - fun warn(message: () -> String) = log(LogLevel.WARN, null, message) - fun error(message: () -> String) = log(LogLevel.ERROR, null, message) - fun fatal(message: () -> String) = log(LogLevel.FATAL, null, message) + fun trace(message: () -> String?) = log(LogLevel.TRACE, null, message) + fun debug(message: () -> String?) = log(LogLevel.DEBUG, null, message) + fun info(message: () -> String?) = log(LogLevel.INFO, null, message) + fun warn(message: () -> String?) = log(LogLevel.WARN, null, message) + fun error(message: () -> String?) = log(LogLevel.ERROR, null, message) + fun fatal(message: () -> String?) = log(LogLevel.FATAL, null, message) - fun trace(thrown: Throwable, message: () -> String) = log(LogLevel.TRACE, thrown, message) - fun debug(thrown: Throwable, message: () -> String) = log(LogLevel.DEBUG, thrown, message) - fun info(thrown: Throwable, message: () -> String) = log(LogLevel.INFO, thrown, message) - fun warn(thrown: Throwable, message: () -> String) = log(LogLevel.WARN, thrown, message) - fun error(thrown: Throwable, message: () -> String) = log(LogLevel.ERROR, thrown, message) - fun fatal(thrown: Throwable, message: () -> String) = log(LogLevel.FATAL, thrown, message) + fun trace(thrown: Throwable, message: () -> String?) = log(LogLevel.TRACE, thrown, message) + fun debug(thrown: Throwable, message: () -> String?) = log(LogLevel.DEBUG, thrown, message) + fun info(thrown: Throwable, message: () -> String?) = log(LogLevel.INFO, thrown, message) + fun warn(thrown: Throwable, message: () -> String?) = log(LogLevel.WARN, thrown, message) + fun error(thrown: Throwable, message: () -> String?) = log(LogLevel.ERROR, thrown, message) + fun fatal(thrown: Throwable, message: () -> String?) = log(LogLevel.FATAL, thrown, message) private fun log( level: LogLevel, thrown: Throwable? = null, - message: () -> String + message: () -> String? ) { if (level.ordinal >= this.level.ordinal) { val timestamp: String = getTimestamp() @@ -59,7 +59,7 @@ class Logger( logEntry.append(caller) logEntry.append(" - ") } - logEntry.append(message()) + logEntry.append(message() ?: "") println(logEntry) thrown?.printStackTrace()