Refactor logging

Author: onoderis

src/main/kotlin/failchat/AppStateManager.kt

@@ -44,7 +44,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import mu.KLogging
+import mu.KotlinLogging
 import org.apache.commons.configuration2.Configuration
 import org.kodein.di.DirectDI
 import org.kodein.di.factory
@@ -58,7 +58,9 @@ import kotlin.concurrent.withLock
 
 class AppStateManager(private val kodein: DirectDI) {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     private val messageIdGenerator: MessageIdGenerator = kodein.instance()
     private val peka2tvApiClient: Peka2tvApiClient = kodein.instance()

src/main/kotlin/failchat/ConfigLoader.kt

@@ -1,6 +1,6 @@
 package failchat
 
-import mu.KLogging
+import mu.KotlinLogging
 import org.apache.commons.configuration2.CompositeConfiguration
 import org.apache.commons.configuration2.Configuration
 import org.apache.commons.configuration2.PropertiesConfiguration
@@ -16,7 +16,9 @@ import java.nio.file.Path
  * */
 class ConfigLoader(private val configDirectory: Path) {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     private val userConfigPath = configDirectory.resolve("user.properties")
     private val defaultConfig = createMandatoryConfig("/config/default.properties")

src/main/kotlin/failchat/chat/ChatMessageSender.kt

@@ -14,7 +14,7 @@ import failchat.util.Do
 import failchat.util.toHexFormat
 import failchat.viewers.COUNTABLE_ORIGINS
 import failchat.ws.server.WsFrameSender
-import mu.KLogging
+import mu.KotlinLogging
 
 //todo use dto
 class ChatMessageSender(
@@ -23,7 +23,9 @@ class ChatMessageSender(
         private val objectMapper: ObjectMapper
 ) {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     private val config = appConfiguration.config
 

src/main/kotlin/failchat/chat/badge/BadgeManager.kt

@@ -11,15 +11,17 @@ import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.future.await
-import mu.KLogging
+import mu.KotlinLogging
 
 class BadgeManager(
         private val badgeStorage: BadgeStorage,
         private val twitchApiClient: TokenAwareTwitchApiClient,
         private val peka2tvApiClient: Peka2tvApiClient
 ) {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     suspend fun loadGlobalBadges() {
         val jobsList: MutableList<Deferred<Unit>> = ArrayList()

src/main/kotlin/failchat/chat/handlers/ChatHistoryLogger.kt

@@ -6,15 +6,16 @@ import failchat.chat.Image
 import failchat.chat.Link
 import failchat.chat.MessageHandler
 import failchat.emoticon.Emoticon
-import mu.KLogging
+import mu.KotlinLogging
 import java.io.BufferedWriter
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 
 class ChatHistoryLogger(private val chatHistoryWriter: BufferedWriter) : MessageHandler<ChatMessage> {
 
-    private companion object : KLogging() {
+    private companion object {
+        val logger = KotlinLogging.logger {}
         val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME
         val zone: ZoneId = ZoneId.systemDefault()
     }

src/main/kotlin/failchat/chat/handlers/IgnoreFilter.kt

@@ -7,7 +7,7 @@ import failchat.chat.ChatMessage
 import failchat.chat.MessageFilter
 import failchat.chatOrigins
 import failchat.util.value
-import mu.KLogging
+import mu.KotlinLogging
 import org.apache.commons.configuration2.Configuration
 import java.util.concurrent.atomic.AtomicReference
 import java.util.regex.Pattern
@@ -18,7 +18,9 @@ import java.util.regex.Pattern
  */
 class IgnoreFilter(private val config: Configuration) : MessageFilter<ChatMessage> {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     private val ignoreStringPattern: Pattern = compilePattern()
 

src/main/kotlin/failchat/emoticon/ChannelEmoticonUpdater.kt

@@ -9,7 +9,7 @@ import failchat.twitch.FfzChannelNotFoundException
 import failchat.twitch.SevenTvApiClient
 import failchat.twitch.SevenTvChannelNotFoundException
 import kotlinx.coroutines.future.await
-import mu.KLogging
+import mu.KotlinLogging
 
 class ChannelEmoticonUpdater(
         private val emoticonStorage: EmoticonStorage,
@@ -18,7 +18,9 @@ class ChannelEmoticonUpdater(
         private val sevenTvApiClient: SevenTvApiClient
 ) {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     suspend fun updateBttvEmoticons(channelName: String) {
         val emoticons = try {

src/main/kotlin/failchat/emoticon/EmoticonManager.kt

@@ -4,7 +4,7 @@ import failchat.emoticon.EmoticonLoadConfiguration.LoadType.BULK
 import failchat.emoticon.EmoticonLoadConfiguration.LoadType.STREAM
 import kotlinx.coroutines.flow.consumeAsFlow
 import kotlinx.coroutines.flow.map
-import mu.KLogging
+import mu.KotlinLogging
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
@@ -14,7 +14,9 @@ class EmoticonManager(
         private val scheduledExecutorService: ScheduledExecutorService
 ) {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     /**
      * Load emoticons by the specified configurations and put them into the storage. Blocking call
@@ -65,7 +67,7 @@ class EmoticonManager(
                 loadedSuccessfully = true
                 break
             } catch (e: Exception) {
-                logger.warn("Failed to load emoticon list for {} via bulk loader {}", origin, e, bulkLoader)
+                logger.warn(e) { "Failed to load emoticon list for $origin via bulk loader $bulkLoader" }
             }
         }
 

src/main/kotlin/failchat/emoticon/EmoticonStorage.kt

@@ -3,11 +3,13 @@ package failchat.emoticon
 import failchat.Origin
 import failchat.util.enumMap
 import kotlinx.coroutines.flow.Flow
-import mu.KLogging
+import mu.KotlinLogging
 
 class EmoticonStorage : EmoticonFinder {
 
-    private companion object : KLogging()
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     private var originStorages: Map<Origin, OriginEmoticonStorage> = Origin.values
             .map { it to EmptyEmoticonStorage(it) }

src/main/kotlin/failchat/emoticon/EmptyEmoticonStorage.kt

@@ -2,10 +2,13 @@ package failchat.emoticon
 
 import failchat.Origin
 import kotlinx.coroutines.flow.Flow
-import mu.KLogging
+import mu.KotlinLogging
 
 class EmptyEmoticonStorage(override val origin: Origin) : OriginEmoticonStorage {
-    private companion object : KLogging()
+
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
 
     override fun findByCode(code: String): Emoticon? = null
     override fun findById(id: String): Emoticon? = null