mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2025-09-08 17:49:35 +00:00
update KSLog part of library
This commit is contained in:
@@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
## 24.0.2
|
## 24.0.2
|
||||||
|
|
||||||
|
* `DefaultKTgBotAPIKSLog` will drop `CancellationException`s by default
|
||||||
|
* You may configure `DefaultKTgBotAPIKSLog` in simple way with `SetDefaultKTgBotAPIKSLog`
|
||||||
|
|
||||||
## 24.0.1
|
## 24.0.1
|
||||||
|
|
||||||
* `Core`:
|
* `Core`:
|
||||||
|
@@ -2,18 +2,59 @@ package dev.inmo.tgbotapi.utils
|
|||||||
|
|
||||||
import dev.inmo.kslog.common.KSLog
|
import dev.inmo.kslog.common.KSLog
|
||||||
import dev.inmo.kslog.common.LogLevel
|
import dev.inmo.kslog.common.LogLevel
|
||||||
|
import dev.inmo.kslog.common.MessageFilter
|
||||||
import dev.inmo.kslog.common.TagLogger
|
import dev.inmo.kslog.common.TagLogger
|
||||||
|
import dev.inmo.kslog.common.filter.filtered
|
||||||
|
import kotlinx.coroutines.CancellationException
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default tag for [DefaultKTgBotAPIKSLog]. You may change it and tag will be changed since the near logging
|
* Default tag for [DefaultKTgBotAPIKSLog]. You may change it and tag will be changed since the near logging
|
||||||
*/
|
*/
|
||||||
var DefaultKTgBotAPIKSLogSystemTag: String = "KTgBot"
|
var DefaultKTgBotAPIKSLogSystemTag: String = "KTgBot"
|
||||||
|
|
||||||
|
private inline fun CreateDefaultKSLogger(
|
||||||
|
crossinline loggerTagGetter: () -> String,
|
||||||
|
dropCancellationExceptions: Boolean = true,
|
||||||
|
noinline additionalLoggerMapper: (KSLog.() -> KSLog)? = null
|
||||||
|
): KSLog {
|
||||||
|
val filter: MessageFilter? = if (dropCancellationExceptions) {
|
||||||
|
{ ll, message, e ->
|
||||||
|
e !is CancellationException
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
return KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
|
||||||
|
TagLogger(loggerTagGetter()).performLog(level, tag, message, throwable)
|
||||||
|
}.let {
|
||||||
|
if (filter == null) {
|
||||||
|
additionalLoggerMapper ?.invoke(it) ?: it
|
||||||
|
} else {
|
||||||
|
val base = it.filtered(filter)
|
||||||
|
additionalLoggerMapper ?.invoke(base) ?: base
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Default realization of [KSLog] which will be used everywhere where there is no some custom variant of [KSLog]
|
* Default realization of [KSLog] which will be used everywhere where there is no some custom variant of [KSLog]
|
||||||
*
|
*
|
||||||
* By default, uses [KSLog] factory with lambda and tag [DefaultKTgBotAPIKSLogSystemTag] (which in fact falling back to
|
* By default, uses [KSLog] factory with lambda and tag [DefaultKTgBotAPIKSLogSystemTag] (which in fact falling back to
|
||||||
* [KSLog.default] with `KTgBot` default tag)
|
* [KSLog.default] with `KTgBot` default tag)
|
||||||
|
*
|
||||||
|
* @see SetDefaultKTgBotAPIKSLog
|
||||||
*/
|
*/
|
||||||
var DefaultKTgBotAPIKSLog: KSLog = KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
|
var DefaultKTgBotAPIKSLog: KSLog = CreateDefaultKSLogger({ DefaultKTgBotAPIKSLogSystemTag } )
|
||||||
TagLogger(DefaultKTgBotAPIKSLogSystemTag).performLog(level, tag, message, throwable)
|
|
||||||
|
/**
|
||||||
|
* Setting [DefaultKTgBotAPIKSLog] with applying of [dropCancellationExceptions] and [additionalFilter] to it
|
||||||
|
*
|
||||||
|
* @param dropCancellationExceptions Will drap coroutines job [CancellationException]s
|
||||||
|
* @param additionalLoggerMapper Receives [KSLog] to allow you to use extensions like [filtered]. Returned
|
||||||
|
* [KSLog] will be used as the result [KSLog] in [DefaultKTgBotAPIKSLog]
|
||||||
|
*/
|
||||||
|
fun SetDefaultKTgBotAPIKSLog(
|
||||||
|
dropCancellationExceptions: Boolean = true,
|
||||||
|
additionalLoggerMapper: (KSLog.() -> KSLog)? = null
|
||||||
|
) {
|
||||||
|
DefaultKTgBotAPIKSLog = CreateDefaultKSLogger({ DefaultKTgBotAPIKSLogSystemTag }, dropCancellationExceptions, additionalLoggerMapper)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user