From d756f9b05f0c03d4eaace6a4edfe4a4f37be9423 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 6 Oct 2015 02:23:44 -0700 Subject: [PATCH] Clean up. --- .../kotlin/com/beust/kobalt/misc/KobaltLogger.kt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt b/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt index 17fcc907..27480154 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt @@ -5,10 +5,7 @@ import org.slf4j.LoggerFactory public interface KobaltLogger { val logger : Logger - get() = LoggerFactory.getLogger(javaClass.getSimpleName()) - -// private fun log(method: Function1, message: String) = -// method.invoke(message) + get() = LoggerFactory.getLogger(javaClass.simpleName) companion object { @@ -16,19 +13,16 @@ public interface KobaltLogger { fun log(level: Int, s: String) { if (level <= LOG_LEVEL) { - LoggerFactory.getLogger(KobaltLogger::class.java.getSimpleName()).info(s) + LoggerFactory.getLogger(KobaltLogger::class.java.simpleName).info(s) } } fun warn(s: String, e: Throwable? = null) { - LoggerFactory.getLogger(KobaltLogger::class.java.getSimpleName()).warn(s, e) + LoggerFactory.getLogger(KobaltLogger::class.java.simpleName).warn(s, e) } } final fun log(level: Int = 1, message: String) { - // Compiler crashing if I use LOG_LEVEL here - // Caused by: java.lang.VerifyError: Bad invokespecial instruction: current class isn't - // assignable to reference class. if (level <= LOG_LEVEL) { logger.info(message) } @@ -39,7 +33,7 @@ public interface KobaltLogger { } final fun error(message: String, e: Throwable? = null) { - logger.error("***** ${message}", e) + logger.error("***** $message", e) } final fun warn(message: String, e: Throwable? = null) {