From 37fd9f39d3ccbbbc7d97aa98c4ae1251e60637fb Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Sat, 11 Jun 2022 19:19:19 +0600
Subject: [PATCH] fixes in logging

---
 bot/src/main/kotlin/dev/inmo/plagubot/App.kt  |  1 -
 .../kotlin/dev/inmo/plagubot/HelloPlugin.kt   |  7 +++----
 .../main/kotlin/dev/inmo/plagubot/PlaguBot.kt | 20 +++++++++----------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/App.kt b/bot/src/main/kotlin/dev/inmo/plagubot/App.kt
index 24171a6..d364515 100644
--- a/bot/src/main/kotlin/dev/inmo/plagubot/App.kt
+++ b/bot/src/main/kotlin/dev/inmo/plagubot/App.kt
@@ -2,7 +2,6 @@ package dev.inmo.plagubot
 
 import dev.inmo.kslog.common.*
 import dev.inmo.plagubot.config.*
-import kotlinx.coroutines.*
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.json.jsonObject
 import java.io.File
diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/HelloPlugin.kt b/bot/src/main/kotlin/dev/inmo/plagubot/HelloPlugin.kt
index 73d5956..77dba0d 100644
--- a/bot/src/main/kotlin/dev/inmo/plagubot/HelloPlugin.kt
+++ b/bot/src/main/kotlin/dev/inmo/plagubot/HelloPlugin.kt
@@ -1,7 +1,6 @@
 package dev.inmo.plagubot
 
-import dev.inmo.kslog.common.d
-import dev.inmo.kslog.common.logger
+import dev.inmo.kslog.common.*
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
@@ -32,8 +31,8 @@ class HelloPlugin : Plugin {
     }
 
     override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
-        logger.d(koin.get<HelloPluginConfig>().print)
-        logger.d(getMe().toString())
+        logger.d { koin.get<HelloPluginConfig>().print }
+        logger.dS { getMe().toString() }
         onCommand("hello_world") {
             reply(it, "Hello :)")
         }
diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
index dd3da21..59b1cdb 100644
--- a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
+++ b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
@@ -49,7 +49,7 @@ data class PlaguBot(
                         }
                     }
                 }.onFailure { e ->
-                    logger.log(LogLevel.WARNING, "Unable to load DI part of $it", e)
+                    logger.w("Unable to load DI part of $it", e)
                 }.getOrNull()
             }
         )
@@ -59,14 +59,14 @@ data class PlaguBot(
         config.plugins.map {
             launch {
                 runCatchingSafely {
-                    logger.info("Start loading of $it")
+                    logger.i("Start loading of $it")
                     with(it) {
                         setupBotPlugin(koin)
                     }
                 }.onFailure { e ->
-                    logger.log(LogLevel.WARNING, "Unable to load bot part of $it", e)
+                    logger.w("Unable to load bot part of $it", e)
                 }.onSuccess {
-                    logger.info("Complete loading of $it")
+                    logger.i("Complete loading of $it")
                 }
             }
         }.joinAll()
@@ -78,26 +78,26 @@ data class PlaguBot(
     suspend fun start(
         scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
     ): Job {
-        logger.info("Start initialization")
+        logger.i("Start initialization")
         val koinApp = KoinApplication.init()
         koinApp.modules(
             module {
                 setupDI(config.databaseConfig.database, json)
             }
         )
-        logger.info("Modules loaded")
+        logger.i("Modules loaded")
         GlobalContext.startKoin(koinApp)
-        logger.info("Koin started")
+        logger.i("Koin started")
         lateinit var behaviourContext: BehaviourContext
         bot.buildBehaviour(scope = scope) {
-            logger.info("Start setup of bot part")
+            logger.i("Start setup of bot part")
             behaviourContext = this
             setupBotPlugin(koinApp.koin)
             deleteWebhook()
         }
-        logger.info("Behaviour builder has been setup")
+        logger.i("Behaviour builder has been setup")
         return bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
-            logger.info("Long polling has been started")
+            logger.i("Long polling has been started")
         }
     }
 }