diff --git a/scalabot-app/src/main/kotlin/AppConfigs.kt b/scalabot-app/src/main/kotlin/AppConfigs.kt index 7c19ed0..51f54ab 100644 --- a/scalabot-app/src/main/kotlin/AppConfigs.kt +++ b/scalabot-app/src/main/kotlin/AppConfigs.kt @@ -12,6 +12,7 @@ import org.eclipse.aether.repository.Authentication import org.eclipse.aether.repository.Proxy import org.eclipse.aether.repository.RemoteRepository import org.eclipse.aether.repository.RepositoryPolicy +import org.slf4j.event.Level import org.telegram.telegrambots.bots.DefaultBotOptions import java.io.File import java.net.URL @@ -248,6 +249,34 @@ internal class LogDirectorySupplier : PropertyDefinerBase() { } } +internal class LogLevelSupplier : PropertyDefinerBase() { + override fun getPropertyValue(): String { + val property = System.getProperty("scalabot.log.level", System.getenv("BOT_LOG_LEVEL")) + val level = if (property != null) { + try { + Level.valueOf(property.uppercase()) + } catch (e: IllegalArgumentException) { + addWarn("Invalid log level: `$property`, the log will be output using the Info log level.") + Level.INFO + } + } else { + Level.INFO + } + return level.name + } +} + +internal class NetworkVerboseLogSupplier : PropertyDefinerBase() { + override fun getPropertyValue(): String { + val propertyValue = System.getProperty("scalabot.log.network.verbose", "false") + return if (propertyValue.toBoolean()) { + "DEBUG" + } else { + "INFO" + } + } +} + internal object Const { val config = loadAppConfig() const val METRICS_NAMESPACE = "scalabot" diff --git a/scalabot-app/src/main/resources/base-logback.xml b/scalabot-app/src/main/resources/base-logback.xml index 82da7b8..b1dc020 100644 --- a/scalabot-app/src/main/resources/base-logback.xml +++ b/scalabot-app/src/main/resources/base-logback.xml @@ -1,6 +1,8 @@ + + diff --git a/scalabot-app/src/main/resources/logback-test.xml b/scalabot-app/src/main/resources/logback-test.xml deleted file mode 100644 index dce4786..0000000 --- a/scalabot-app/src/main/resources/logback-test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scalabot-app/src/main/resources/logback.xml b/scalabot-app/src/main/resources/logback.xml index 041f5fa..10a4e74 100644 --- a/scalabot-app/src/main/resources/logback.xml +++ b/scalabot-app/src/main/resources/logback.xml @@ -1,7 +1,14 @@ - + + + + + + + +