mirror of
				https://github.com/InsanusMokrassar/KSLog.git
				synced 2025-11-04 05:20:38 +00:00 
			
		
		
		
	Compare commits
	
		
			41 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 669afe481d | |||
| 42db9da058 | |||
| 72de26adac | |||
| 4b47a4e817 | |||
| 785ab59519 | |||
| a4f2562690 | |||
| 777ae44da5 | |||
| 28d61a7b7c | |||
| 66c5451293 | |||
| 77ca9ce25b | |||
| 194e52f521 | |||
| 34ea0bd91a | |||
| 3ff5d989b7 | |||
| 0e01534562 | |||
| 35e3d02837 | |||
| b255406dba | |||
| 88fa4e3c09 | |||
| 4d9481f07b | |||
| 54e448f5a0 | |||
| 8729acfff3 | |||
| 923add4550 | |||
| 8dc96f708e | |||
| 4d98b7df18 | |||
| be48c2559e | |||
| 437b1675e2 | |||
| 7fa929fb7a | |||
| 9c8d8899b1 | |||
| 1d16902e69 | |||
| a0982dbd83 | |||
| 6fa68b1e94 | |||
| 191433cc75 | |||
| 5434971487 | |||
| b819a68cb5 | |||
| acb9b350ba | |||
| 65834ffcb4 | |||
| 7f63d30274 | |||
| 81af45ba5d | |||
| caf6a2d05c | |||
| effeaa7ef7 | |||
| 602ba0e1c8 | |||
| de7f735ad0 | 
							
								
								
									
										43
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,6 +1,47 @@
 | 
			
		||||
# Changelog
 | 
			
		||||
 | 
			
		||||
## 0.2.1
 | 
			
		||||
## 0.5.1
 | 
			
		||||
 | 
			
		||||
* New property `defaultMessageFormatterWithErrorPrint` for messages format with errors
 | 
			
		||||
 | 
			
		||||
## 0.5.0
 | 
			
		||||
 | 
			
		||||
* `Kotlin`: `1.7.10`
 | 
			
		||||
 | 
			
		||||
## 0.4.2
 | 
			
		||||
 | 
			
		||||
* Add `setDefaultKSLog` and `addDefaultKSLog`
 | 
			
		||||
* Add `plus` operation for two `KSLog` instances to call them both on each log performing
 | 
			
		||||
* Add `KSLog` factory for simple creation of `CallbackKSLog`
 | 
			
		||||
* Add `MessageFormatter` factory
 | 
			
		||||
 | 
			
		||||
## 0.4.1
 | 
			
		||||
 | 
			
		||||
* Fixes in resolution ambiguity for functions with messages
 | 
			
		||||
 | 
			
		||||
## 0.4.0
 | 
			
		||||
 | 
			
		||||
**THIS UPDATE CONTAINS BREAKING CHANGES**
 | 
			
		||||
 | 
			
		||||
* **BREAKING CHANGE** Any `KSLog` now accept any object. It was made to allow to work with structured logging
 | 
			
		||||
* New factory for `TagLogger`: fun `taggedLogger`
 | 
			
		||||
* New logger has been added: `TypedLogger`
 | 
			
		||||
* New logger has been added: `FilterLogger`
 | 
			
		||||
* **BREAKING CHANGE** Logger `DefaultKSLog` lost its constructor with `filter`. Currently, it is still available as factory function
 | 
			
		||||
 | 
			
		||||
## 0.3.2
 | 
			
		||||
 | 
			
		||||
* Add duplication functions for all extensions which allow to send log without tag but with exception and message builder
 | 
			
		||||
 | 
			
		||||
## 0.3.1
 | 
			
		||||
 | 
			
		||||
* Technical fixes for compatibility with Java 8
 | 
			
		||||
 | 
			
		||||
## 0.3.0
 | 
			
		||||
 | 
			
		||||
* **BREAKING CHANGE**: Filters will not accept message since this update
 | 
			
		||||
* New `KSLog` realization `DefaultKSLog`
 | 
			
		||||
* Now platforms realize their default loggers callbacks instead of `KSLog` factories
 | 
			
		||||
 | 
			
		||||
## 0.2.0
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								README.md
									
									
									
									
									
								
							@@ -25,18 +25,26 @@ KSLog.i("Some message")
 | 
			
		||||
KSLog.i("Some tag", "Some message")
 | 
			
		||||
// OR
 | 
			
		||||
KSLog.i("Some tag", "Some message", IllegalArgumentException("So, that is exception :)"))
 | 
			
		||||
// OR
 | 
			
		||||
KSLog.i("Some optional tag", Exception("Optional")) { "Lazy inited message" }
 | 
			
		||||
// OR
 | 
			
		||||
KSLog.iS("Some optional tag", Exception("Optional")) { "Lazy inited message for suspendable calculation of text" }
 | 
			
		||||
// OR EVEN
 | 
			
		||||
KSLog.l(LogLevel.INFO, "Some tag", "Some message", IllegalArgumentException("So, that is exception :)"))
 | 
			
		||||
// OR
 | 
			
		||||
KSLog.l(LogLevel.INFO, "Some optional tag", IllegalArgumentException("So, that is exception :)")) { "And lazily inited message" }
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
### A little bit deeper
 | 
			
		||||
 | 
			
		||||
There are several important things in context of this library:
 | 
			
		||||
There are several important "terms" in context of this library:
 | 
			
		||||
 | 
			
		||||
* Default logger (available via `KSLog`)
 | 
			
		||||
* Default logger (available via `KSLog.default`)
 | 
			
		||||
* Local logger (can be created via `KSLog` functions and passed anywhere as `KSLog`)
 | 
			
		||||
* Logging shortcuts like `KSLog.i`/`KSLog.info`
 | 
			
		||||
 | 
			
		||||
Every logging extension (like `KSLog.i`) have its analog with lazy inited message text and the same one with suffix `S` (like `KSLog.iS`) for the suspendable message calculation.
 | 
			
		||||
 | 
			
		||||
Default logger can be created by passing `defaultTag` and one of variants log level filters: set or minimal loggable level. In `JVM` you also may setup any logger as base logger for default realizations of `KSLog`. Besides, you may use your own callback (on **any target platform**) as output of logging:
 | 
			
		||||
 | 
			
		||||
```kotlin
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										13
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								build.gradle
									
									
									
									
									
								
							@@ -33,7 +33,13 @@ repositories {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
kotlin {
 | 
			
		||||
    jvm()
 | 
			
		||||
    jvm {
 | 
			
		||||
        compilations.main {
 | 
			
		||||
            kotlinOptions {
 | 
			
		||||
                jvmTarget = "1.8"
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    js(IR) {
 | 
			
		||||
        browser()
 | 
			
		||||
        nodejs()
 | 
			
		||||
@@ -52,9 +58,8 @@ kotlin {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
java {
 | 
			
		||||
    toolchain {
 | 
			
		||||
        languageVersion = JavaLanguageVersion.of(8)
 | 
			
		||||
    }
 | 
			
		||||
    sourceCompatibility = JavaVersion.VERSION_1_8
 | 
			
		||||
    targetCompatibility = JavaVersion.VERSION_1_8
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
apply from: "defaultAndroidSettings.gradle"
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@ if (new File(projectDir, "secret.gradle").exists()) {
 | 
			
		||||
        owner "InsanusMokrassar"
 | 
			
		||||
        repo "KSLog"
 | 
			
		||||
 | 
			
		||||
        tagName "${project.version}"
 | 
			
		||||
        tagName "v${project.version}"
 | 
			
		||||
        releaseName "${project.version}"
 | 
			
		||||
        targetCommitish "${project.version}"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -9,5 +9,5 @@ android.enableJetifier=true
 | 
			
		||||
# Project data
 | 
			
		||||
 | 
			
		||||
group=dev.inmo
 | 
			
		||||
version=0.2.1
 | 
			
		||||
android_code_version=7
 | 
			
		||||
version=0.5.1
 | 
			
		||||
android_code_version=14
 | 
			
		||||
 
 | 
			
		||||
@@ -1,18 +1,18 @@
 | 
			
		||||
[versions]
 | 
			
		||||
 | 
			
		||||
kotlin = "1.6.21"
 | 
			
		||||
kotlin-gradle-plugin = "7.0.4"
 | 
			
		||||
kotlin = "1.7.10"
 | 
			
		||||
kotlin-gradle-plugin = "7.2.2"
 | 
			
		||||
 | 
			
		||||
dexcount = "3.1.0"
 | 
			
		||||
junit_version = "4.12"
 | 
			
		||||
test_ext_junit_version = "1.1.2"
 | 
			
		||||
espresso_core = "3.3.0"
 | 
			
		||||
test_ext_junit_version = "1.1.3"
 | 
			
		||||
espresso_core = "3.4.0"
 | 
			
		||||
 | 
			
		||||
android-minSdk = "21"
 | 
			
		||||
android-compileSdk = "32"
 | 
			
		||||
android-buildTools = "32.0.0"
 | 
			
		||||
 | 
			
		||||
github-release = "2.3.7"
 | 
			
		||||
github-release = "2.4.1"
 | 
			
		||||
 | 
			
		||||
[libraries]
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
			
		||||
distributionBase=GRADLE_USER_HOME
 | 
			
		||||
distributionPath=wrapper/dists
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 | 
			
		||||
zipStoreBase=GRADLE_USER_HOME
 | 
			
		||||
zipStorePath=wrapper/dists
 | 
			
		||||
 
 | 
			
		||||
@@ -4,3 +4,5 @@ val Any.logTag
 | 
			
		||||
    get() = this::class.simpleName ?: error("Unable to retrieve log tag")
 | 
			
		||||
val Any.logger: KSLog
 | 
			
		||||
    get() = TagLogger(logTag)
 | 
			
		||||
 | 
			
		||||
fun taggedLogger(tagBase: Any): KSLog = tagBase.logger
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,13 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
typealias SimpleKSLogCallback = (level: LogLevel, tag: String?, message: Any, throwable: Throwable?) -> Unit
 | 
			
		||||
 | 
			
		||||
class CallbackKSLog(
 | 
			
		||||
    private val performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit
 | 
			
		||||
    private val performLogCallback: SimpleKSLogCallback
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    performLogCallback: SimpleKSLogCallback
 | 
			
		||||
) = CallbackKSLog(performLogCallback)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,26 +1,45 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.filter.filtered
 | 
			
		||||
 | 
			
		||||
class DefaultKSLog(
 | 
			
		||||
    private val defaultTag: String,
 | 
			
		||||
    private val filter: MessageFilter = { _, _, _, _ -> true },
 | 
			
		||||
    private val messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
    private val logging: (level: LogLevel, tag: String, message: String, throwable: Throwable?) -> Unit
 | 
			
		||||
    private val logging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = defaultLogging
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) {
 | 
			
		||||
        TODO("Not yet implemented")
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
 | 
			
		||||
        val tag = tag ?: defaultTag
 | 
			
		||||
 | 
			
		||||
        val text = messageFormatter(level, tag, message, throwable)
 | 
			
		||||
        logging(level, tag, text, throwable)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> String) {
 | 
			
		||||
        super.performLog(level, tag, throwable, messageBuilder)
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> Any) {
 | 
			
		||||
        val tag = tag ?: defaultTag
 | 
			
		||||
 | 
			
		||||
        val text = messageFormatter(level, tag, messageBuilder(), throwable)
 | 
			
		||||
        logging(level, tag, text, throwable)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override suspend fun performLog(
 | 
			
		||||
    override suspend fun performLogS(
 | 
			
		||||
        level: LogLevel,
 | 
			
		||||
        tag: String?,
 | 
			
		||||
        throwable: Throwable?,
 | 
			
		||||
        messageBuilder: suspend () -> String
 | 
			
		||||
        messageBuilder: suspend () -> Any
 | 
			
		||||
    ) {
 | 
			
		||||
        if (filter(level, tag, ))
 | 
			
		||||
        super.performLog(level, tag, throwable, messageBuilder)
 | 
			
		||||
        val tag = tag ?: defaultTag
 | 
			
		||||
 | 
			
		||||
        val text = messageFormatter(level, tag, messageBuilder(), throwable)
 | 
			
		||||
        logging(level, tag, text, throwable)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Deprecated("Filtering should be replaced with FilterKSLog")
 | 
			
		||||
fun DefaultKSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: MessageFilter = { _, _, _ -> true },
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
    logging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = defaultLogging
 | 
			
		||||
) = DefaultKSLog(
 | 
			
		||||
    defaultTag, messageFormatter, logging
 | 
			
		||||
).filtered(filter)
 | 
			
		||||
 
 | 
			
		||||
@@ -2,72 +2,184 @@
 | 
			
		||||
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = performLog(level, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, message: String, e: Throwable? = null) = performLog(level, message, e)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String, message: String, e: Throwable? = null) = performLog(level, tag, message, e)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = performLog(level, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String, noinline messageBuilder: () -> Any) = performLog(level, tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.logS(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = performLogS(level, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.logS(level: LogLevel, tag: String, noinline messageBuilder: suspend () -> Any) = performLogS(level, tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, e: Throwable? = null, noinline messageBuilder: () -> Any) = performLog(level, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.logS(level: LogLevel, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = performLogS(level, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, message: Any, e: Throwable?) = performLog(level, message, e)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, message: String, e: Throwable) = log(level, message as Any, e)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, message: Any) = performLog(level, message, null)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String, message: Any, e: Throwable?) = performLog(level, tag, message, e)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String, message: Any) = performLog(level, tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.verbose(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.VERBOSE, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.verbose(message: String, e: Throwable? = null) = log(LogLevel.VERBOSE, message, e)
 | 
			
		||||
inline fun KSLog.verbose(tag: String, message: String, e: Throwable? = null) = log(LogLevel.VERBOSE, tag, message, e)
 | 
			
		||||
inline fun KSLog.debug(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.DEBUG, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.debug(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.DEBUG, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.debug(tag: String, noinline messageBuilder: () -> Any) = debug(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.debugS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.DEBUG, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.debugS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.DEBUG, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.debugS(tag: String, noinline messageBuilder: suspend () -> Any) = debugS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.debug(message: Any, e: Throwable?) = log(LogLevel.DEBUG, message, e)
 | 
			
		||||
inline fun KSLog.debug(message: String, e: Throwable) = debug(message as Any, e)
 | 
			
		||||
inline fun KSLog.debug(message: Any) = debug(message, null)
 | 
			
		||||
inline fun KSLog.debug(tag: String, message: Any, e: Throwable?) = log(LogLevel.DEBUG, tag, message, e)
 | 
			
		||||
inline fun KSLog.debug(tag: String, message: Any) = debug(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.info(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.INFO, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.info(message: String, e: Throwable? = null) = log(LogLevel.INFO, message, e)
 | 
			
		||||
inline fun KSLog.info(tag: String, message: String, e: Throwable? = null) = log(LogLevel.INFO, tag, message, e)
 | 
			
		||||
inline fun KSLog.verbose(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.VERBOSE, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.verbose(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.VERBOSE, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.verbose(tag: String, noinline messageBuilder: () -> Any) = verbose(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.verboseS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.VERBOSE, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.verboseS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.VERBOSE, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.verboseS(tag: String, noinline messageBuilder: suspend () -> Any) = verboseS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.verbose(message: Any, e: Throwable?) = log(LogLevel.VERBOSE, message, e)
 | 
			
		||||
inline fun KSLog.verbose(message: String, e: Throwable) = verbose(message as Any, e)
 | 
			
		||||
inline fun KSLog.verbose(message: Any) = verbose(message, null)
 | 
			
		||||
inline fun KSLog.verbose(tag: String, message: Any, e: Throwable?) = log(LogLevel.VERBOSE, tag, message, e)
 | 
			
		||||
inline fun KSLog.verbose(tag: String, message: Any) = verbose(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.warning(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.WARNING, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.warning(message: String, e: Throwable? = null) = log(LogLevel.WARNING, message, e)
 | 
			
		||||
inline fun KSLog.warning(tag: String, message: String, e: Throwable? = null) = log(LogLevel.WARNING, tag, message, e)
 | 
			
		||||
inline fun KSLog.info(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.INFO, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.info(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.INFO, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.info(tag: String, noinline messageBuilder: () -> Any) = info(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.infoS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.INFO, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.infoS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.INFO, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.infoS(tag: String, noinline messageBuilder: suspend () -> Any) = infoS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.info(message: Any, e: Throwable?) = log(LogLevel.INFO, message, e)
 | 
			
		||||
inline fun KSLog.info(message: String, e: Throwable) = info(message as Any, e)
 | 
			
		||||
inline fun KSLog.info(message: Any) = info(message, null)
 | 
			
		||||
inline fun KSLog.info(tag: String, message: Any, e: Throwable?) = log(LogLevel.INFO, tag, message, e)
 | 
			
		||||
inline fun KSLog.info(tag: String, message: Any) = info(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.error(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.ERROR, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.error(message: String, e: Throwable? = null) = log(LogLevel.ERROR, message, e)
 | 
			
		||||
inline fun KSLog.error(tag: String, message: String, e: Throwable? = null) = log(LogLevel.ERROR, tag, message, e)
 | 
			
		||||
inline fun KSLog.warning(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.WARNING, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.warning(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.WARNING, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.warning(tag: String, noinline messageBuilder: () -> Any) = warning(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.warningS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.WARNING, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.warningS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.WARNING, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.warningS(tag: String, noinline messageBuilder: suspend () -> Any) = warningS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.warning(message: Any, e: Throwable?) = log(LogLevel.WARNING, message, e)
 | 
			
		||||
inline fun KSLog.warning(message: String, e: Throwable) = warning(message as Any, e)
 | 
			
		||||
inline fun KSLog.warning(message: Any) = warning(message, null)
 | 
			
		||||
inline fun KSLog.warning(tag: String, message: Any, e: Throwable?) = log(LogLevel.WARNING, tag, message, e)
 | 
			
		||||
inline fun KSLog.warning(tag: String, message: Any) = warning(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.assert(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.ASSERT, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.assert(message: String, e: Throwable? = null) = log(LogLevel.ASSERT, message, e)
 | 
			
		||||
inline fun KSLog.assert(tag: String, message: String, e: Throwable? = null) = log(LogLevel.ASSERT, tag, message, e)
 | 
			
		||||
inline fun KSLog.error(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ERROR, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.error(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ERROR, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.error(tag: String, noinline messageBuilder: () -> Any) = error(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.errorS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ERROR, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.errorS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ERROR, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.errorS(tag: String, noinline messageBuilder: suspend () -> Any) = errorS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.error(message: Any, e: Throwable?) = log(LogLevel.ERROR, message, e)
 | 
			
		||||
inline fun KSLog.error(message: String, e: Throwable) = error(message as Any, e)
 | 
			
		||||
inline fun KSLog.error(message: Any) = error(message, null)
 | 
			
		||||
inline fun KSLog.error(tag: String, message: Any, e: Throwable?) = log(LogLevel.ERROR, tag, message, e)
 | 
			
		||||
inline fun KSLog.error(tag: String, message: Any) = error(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.debug(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.DEBUG, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.debug(message: String, e: Throwable? = null) = log(LogLevel.DEBUG, message, e)
 | 
			
		||||
inline fun KSLog.debug(tag: String, message: String, e: Throwable? = null) = log(LogLevel.DEBUG, tag, message, e)
 | 
			
		||||
inline fun KSLog.assert(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ASSERT, null, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.assert(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ASSERT, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.assert(tag: String, noinline messageBuilder: () -> Any) = assert(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.assertS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ASSERT, null, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.assertS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ASSERT, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.assertS(tag: String, noinline messageBuilder: suspend () -> Any) = assertS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.assert(message: Any, e: Throwable?) = log(LogLevel.ASSERT, message, e)
 | 
			
		||||
inline fun KSLog.assert(message: String, e: Throwable) = assert(message as Any, e)
 | 
			
		||||
inline fun KSLog.assert(message: Any) = assert(message, null)
 | 
			
		||||
inline fun KSLog.assert(tag: String, message: Any, e: Throwable?) = log(LogLevel.ASSERT, tag, message, e)
 | 
			
		||||
inline fun KSLog.assert(tag: String, message: Any) = assert(tag, message, null)
 | 
			
		||||
 | 
			
		||||
// ----- Short names
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(level, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, message: String, e: Throwable? = null) = log(level, message, e)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String, message: String, e: Throwable? = null) = log(level, tag, message, e)
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.v(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = verbose(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.v(message: String, e: Throwable? = null) = verbose(message, e)
 | 
			
		||||
inline fun KSLog.v(tag: String, message: String, e: Throwable? = null) = verbose(tag, message, e)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(level, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String, noinline messageBuilder: () -> Any) = l(level, tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(level, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.lS(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(level, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.lS(level: LogLevel, tag: String, noinline messageBuilder: suspend () -> Any) = lS(level, tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.lS(level: LogLevel, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(level, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, message: Any, e: Throwable?) = log(level, message, e)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, message: String, e: Throwable) = l(level, message as Any, e)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, message: Any) = log(level, message, null)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String, message: Any, e: Throwable?) = log(level, tag, message, e)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String, message: Any) = log(level, tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.i(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = info(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.i(message: String, e: Throwable? = null) = info(message, e)
 | 
			
		||||
inline fun KSLog.i(tag: String, message: String, e: Throwable? = null) = info(tag, message, e)
 | 
			
		||||
inline fun KSLog.d(e: Throwable? = null, noinline messageBuilder: () -> Any) = debug(e, messageBuilder)
 | 
			
		||||
inline fun KSLog.d(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = debug(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.d(tag: String, noinline messageBuilder: () -> Any) = d(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.dS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = debugS(e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.dS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = debugS(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.dS(tag: String, noinline messageBuilder: suspend () -> Any) = dS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.d(message: Any, e: Throwable?) = debug(message, e)
 | 
			
		||||
inline fun KSLog.d(message: String, e: Throwable) = d(message as Any, e)
 | 
			
		||||
inline fun KSLog.d(message: Any) = d(message, null)
 | 
			
		||||
inline fun KSLog.d(tag: String, message: Any, e: Throwable?) = debug(tag, message, e)
 | 
			
		||||
inline fun KSLog.d(tag: String, message: Any) = d(tag, message, null)
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.v(e: Throwable? = null, noinline messageBuilder: () -> Any) = verbose(e, messageBuilder)
 | 
			
		||||
inline fun KSLog.v(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = verbose(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.v(tag: String, noinline messageBuilder: () -> Any) = v(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.vS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = verboseS(e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.vS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = verboseS(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.vS(tag: String, noinline messageBuilder: suspend () -> Any) = vS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.v(message: Any, e: Throwable?) = verbose(message, e)
 | 
			
		||||
inline fun KSLog.v(message: String, e: Throwable) = v(message as Any, e)
 | 
			
		||||
inline fun KSLog.v(message: Any) = v(message, null)
 | 
			
		||||
inline fun KSLog.v(tag: String, message: Any, e: Throwable?) = verbose(tag, message, e)
 | 
			
		||||
inline fun KSLog.v(tag: String, message: Any) = v(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.w(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = warning(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.w(message: String, e: Throwable? = null) = warning(message, e)
 | 
			
		||||
inline fun KSLog.w(tag: String, message: String, e: Throwable? = null) = warning(tag, message, e)
 | 
			
		||||
inline fun KSLog.i(e: Throwable? = null, noinline messageBuilder: () -> Any) = info(e, messageBuilder)
 | 
			
		||||
inline fun KSLog.i(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = info(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.i(tag: String, noinline messageBuilder: () -> Any) = i(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.iS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = infoS(e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.iS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = infoS(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.iS(tag: String, noinline messageBuilder: suspend () -> Any) = iS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.i(message: Any, e: Throwable?) = info(message, e)
 | 
			
		||||
inline fun KSLog.i(message: String, e: Throwable) = i(message as Any, e)
 | 
			
		||||
inline fun KSLog.i(message: Any) = i(message, null)
 | 
			
		||||
inline fun KSLog.i(tag: String, message: Any, e: Throwable?) = info(tag, message, e)
 | 
			
		||||
inline fun KSLog.i(tag: String, message: Any) = i(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.e(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = error(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.e(message: String, e: Throwable? = null) = error(message, e)
 | 
			
		||||
inline fun KSLog.e(tag: String, message: String, e: Throwable? = null) = error(tag, message, e)
 | 
			
		||||
inline fun KSLog.w(e: Throwable? = null, noinline messageBuilder: () -> Any) = warning(e, messageBuilder)
 | 
			
		||||
inline fun KSLog.w(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = warning(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.w(tag: String, noinline messageBuilder: () -> Any) = w(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = warningS(e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = warningS(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wS(tag: String, noinline messageBuilder: suspend () -> Any) = wS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.w(message: Any, e: Throwable?) = warning(message, e)
 | 
			
		||||
inline fun KSLog.w(message: String, e: Throwable) = w(message as Any, e)
 | 
			
		||||
inline fun KSLog.w(message: Any) = w(message, null)
 | 
			
		||||
inline fun KSLog.w(tag: String, message: Any, e: Throwable?) = warning(tag, message, e)
 | 
			
		||||
inline fun KSLog.w(tag: String, message: Any) = w(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.wtf(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = assert(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.wtf(message: String, e: Throwable? = null) = assert(message, e)
 | 
			
		||||
inline fun KSLog.wtf(tag: String, message: String, e: Throwable? = null) = assert(tag, message, e)
 | 
			
		||||
inline fun KSLog.e(e: Throwable? = null, noinline messageBuilder: () -> Any) = error(e, messageBuilder)
 | 
			
		||||
inline fun KSLog.e(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = error(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.e(tag: String, noinline messageBuilder: () -> Any) = e(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.eS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = errorS(e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.eS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = errorS(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.eS(tag: String, noinline messageBuilder: suspend () -> Any) = eS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.e(message: Any, e: Throwable?) = error(message, e)
 | 
			
		||||
inline fun KSLog.e(message: String, e: Throwable) = e(message as Any, e)
 | 
			
		||||
inline fun KSLog.e(message: Any) = e(message, null)
 | 
			
		||||
inline fun KSLog.e(tag: String, message: Any, e: Throwable?) = error(tag, message, e)
 | 
			
		||||
inline fun KSLog.e(tag: String, message: Any) = e(tag, message, null)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.d(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = debug(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.d(message: String, e: Throwable? = null) = debug(message, e)
 | 
			
		||||
inline fun KSLog.d(tag: String, message: String, e: Throwable? = null) = debug(tag, message, e)
 | 
			
		||||
inline fun KSLog.wtf(e: Throwable? = null, noinline messageBuilder: () -> Any) = assert(e, messageBuilder)
 | 
			
		||||
inline fun KSLog.wtf(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = assert(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.wtf(tag: String, noinline messageBuilder: () -> Any) = wtf(tag, null, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wtfS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = assertS(e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wtfS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = assertS(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wtfS(tag: String, noinline messageBuilder: suspend () -> Any) = wtfS(tag, null, messageBuilder)
 | 
			
		||||
inline fun KSLog.wtf(message: Any, e: Throwable?) = assert(message, e)
 | 
			
		||||
inline fun KSLog.wtf(message: String, e: Throwable) = wtf(message as Any, e)
 | 
			
		||||
inline fun KSLog.wtf(message: Any) = wtf(message, null)
 | 
			
		||||
inline fun KSLog.wtf(tag: String, message: Any, e: Throwable?) = assert(tag, message, e)
 | 
			
		||||
inline fun KSLog.wtf(tag: String, message: Any) = wtf(tag, message, null)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,8 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.filter.filtered
 | 
			
		||||
import dev.inmo.kslog.common.utils.plus
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
enum class LogLevel {
 | 
			
		||||
    DEBUG,
 | 
			
		||||
@@ -11,20 +14,22 @@ enum class LogLevel {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
interface KSLog {
 | 
			
		||||
    fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?)
 | 
			
		||||
    fun performLog(level: LogLevel, message: String, throwable: Throwable?) = performLog(level, null, message, throwable)
 | 
			
		||||
    fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?)
 | 
			
		||||
    fun performLog(level: LogLevel, message: Any, throwable: Throwable?) = performLog(level, null, message, throwable)
 | 
			
		||||
    fun performLog(
 | 
			
		||||
        level: LogLevel,
 | 
			
		||||
        tag: String?,
 | 
			
		||||
        throwable: Throwable?,
 | 
			
		||||
        messageBuilder: () -> String
 | 
			
		||||
        messageBuilder: () -> Any
 | 
			
		||||
    ) = performLog(level, tag, messageBuilder(), throwable)
 | 
			
		||||
    suspend fun performLog(
 | 
			
		||||
    suspend fun performLogS(
 | 
			
		||||
        level: LogLevel,
 | 
			
		||||
        tag: String?,
 | 
			
		||||
        throwable: Throwable?,
 | 
			
		||||
        messageBuilder: suspend () -> String
 | 
			
		||||
        messageBuilder: suspend () -> Any
 | 
			
		||||
    ) = performLog(level, tag, messageBuilder(), throwable)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    companion object : KSLog {
 | 
			
		||||
        private var defaultLogger: KSLog? = null
 | 
			
		||||
        var default: KSLog
 | 
			
		||||
@@ -36,18 +41,46 @@ interface KSLog {
 | 
			
		||||
            set(value) {
 | 
			
		||||
                defaultLogger = value
 | 
			
		||||
            }
 | 
			
		||||
        override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = default.performLog(level, tag, message, throwable)
 | 
			
		||||
        override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) = default.performLog(level, tag, message, throwable)
 | 
			
		||||
        override fun performLog(level: LogLevel, message: Any, throwable: Throwable?) = default.performLog(level, message, throwable)
 | 
			
		||||
        override fun performLog(
 | 
			
		||||
            level: LogLevel,
 | 
			
		||||
            tag: String?,
 | 
			
		||||
            throwable: Throwable?,
 | 
			
		||||
            messageBuilder: () -> Any
 | 
			
		||||
        ) = default.performLog(level, tag, throwable, messageBuilder)
 | 
			
		||||
        override suspend fun performLogS(
 | 
			
		||||
            level: LogLevel,
 | 
			
		||||
            tag: String?,
 | 
			
		||||
            throwable: Throwable?,
 | 
			
		||||
            messageBuilder: suspend () -> Any
 | 
			
		||||
        ) = default.performLogS(level, tag, throwable, messageBuilder)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
 | 
			
		||||
operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: Any, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
 | 
			
		||||
 | 
			
		||||
expect fun KSLog(
 | 
			
		||||
internal expect val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: MessageFilter = { _, _, _, _ -> true },
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog
 | 
			
		||||
): KSLog = DefaultKSLog(
 | 
			
		||||
    defaultTag,
 | 
			
		||||
    messageFormatter
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@Deprecated("Filtering should be replaced with FilterKSLog")
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: MessageFilter,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog = DefaultKSLog(
 | 
			
		||||
    defaultTag,
 | 
			
		||||
    filter,
 | 
			
		||||
    messageFormatter
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
@@ -55,9 +88,9 @@ fun KSLog(
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog {
 | 
			
		||||
    val levels = levels.toSet()
 | 
			
		||||
    return KSLog (defaultTag, { l, _, _, _ ->
 | 
			
		||||
    return KSLog (defaultTag, messageFormatter).filtered { l, _, _ ->
 | 
			
		||||
        l in levels
 | 
			
		||||
    }, messageFormatter)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
@@ -74,8 +107,10 @@ fun KSLog(
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
): KSLog = KSLog (
 | 
			
		||||
    defaultTag,
 | 
			
		||||
    { l, _, _, _ ->
 | 
			
		||||
        minLoggingLevel.ordinal <= l.ordinal
 | 
			
		||||
    },
 | 
			
		||||
    messageFormatter
 | 
			
		||||
)
 | 
			
		||||
).filtered { l, _, _ ->
 | 
			
		||||
    minLoggingLevel.ordinal <= l.ordinal
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun setDefaultKSLog(newDefault: KSLog) { KSLog.default = newDefault }
 | 
			
		||||
fun addDefaultKSLog(newDefault: KSLog) { KSLog.default = KSLog.default + newDefault }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,8 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
typealias MessageFormatter = (l: LogLevel, t: String, m: String, Throwable?) -> String
 | 
			
		||||
typealias MessageFilter = (l: LogLevel, t: String?, m: String, Throwable?) -> Boolean
 | 
			
		||||
val defaultMessageFormatter: MessageFormatter = { l, t, m, _ -> "[$l] $t - $m" }
 | 
			
		||||
 | 
			
		||||
typealias MessageFormatter = (l: LogLevel, t: String?, m: Any, Throwable?) -> String
 | 
			
		||||
@Suppress("NOTHING_TO_INLINE")
 | 
			
		||||
inline fun MessageFormatter(noinline formatter: MessageFormatter) = formatter
 | 
			
		||||
typealias MessageFilter = (l: LogLevel, t: String?, Throwable?) -> Boolean
 | 
			
		||||
val defaultMessageFormatter: MessageFormatter = { l, t, m, _ -> "[$l] ${t ?.let { "$it " } ?: ""}- $m" }
 | 
			
		||||
val defaultMessageFormatterWithErrorPrint: MessageFormatter = { l, t, m, e -> "[$l] ${t ?.let { "$it " } ?: ""}- $m${e ?.let { ": ${it.stackTraceToString()}" } ?: ""}" }
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@ import kotlin.jvm.JvmInline
 | 
			
		||||
 | 
			
		||||
@JvmInline
 | 
			
		||||
value class TagLogger(val tag: String) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
 | 
			
		||||
        KSLog.performLog(level, tag ?: this.tag, message, throwable)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										32
									
								
								src/commonMain/kotlin/filter/FilterKSLog.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								src/commonMain/kotlin/filter/FilterKSLog.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
			
		||||
package dev.inmo.kslog.common.filter
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.*
 | 
			
		||||
 | 
			
		||||
class FilterKSLog(
 | 
			
		||||
    private val fallbackLogger: KSLog,
 | 
			
		||||
    private val messageFilter: MessageFilter
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
 | 
			
		||||
        if (messageFilter(level, tag, throwable)) {
 | 
			
		||||
            fallbackLogger.performLog(level, tag, message, throwable)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun performLog(level: LogLevel, message: Any, throwable: Throwable?) {
 | 
			
		||||
        if (messageFilter(level, null, throwable)) {
 | 
			
		||||
            fallbackLogger.performLog(level, message, throwable)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> Any) {
 | 
			
		||||
        if (messageFilter(level, tag, throwable)) {
 | 
			
		||||
            fallbackLogger.performLog(level, tag, throwable, messageBuilder)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override suspend fun performLogS(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: suspend () -> Any) {
 | 
			
		||||
        if (messageFilter(level, tag, throwable)) {
 | 
			
		||||
            fallbackLogger.performLogS(level, tag, throwable, messageBuilder)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										8
									
								
								src/commonMain/kotlin/filter/FilteredExtension.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								src/commonMain/kotlin/filter/FilteredExtension.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,8 @@
 | 
			
		||||
package dev.inmo.kslog.common.filter
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.KSLog
 | 
			
		||||
import dev.inmo.kslog.common.MessageFilter
 | 
			
		||||
 | 
			
		||||
fun KSLog.filtered(
 | 
			
		||||
    filter: MessageFilter
 | 
			
		||||
) = FilterKSLog(this, filter)
 | 
			
		||||
							
								
								
									
										23
									
								
								src/commonMain/kotlin/typed/TypedKSLog.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								src/commonMain/kotlin/typed/TypedKSLog.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,23 @@
 | 
			
		||||
package dev.inmo.kslog.common.typed
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.*
 | 
			
		||||
import kotlin.reflect.KClass
 | 
			
		||||
 | 
			
		||||
class TypedKSLog(
 | 
			
		||||
    private val typedLoggers: Map<KClass<*>?, KSLog>
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
 | 
			
		||||
        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, tag, message, throwable)
 | 
			
		||||
    }
 | 
			
		||||
    override fun performLog(level: LogLevel, message: Any, throwable: Throwable?) {
 | 
			
		||||
        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, message, throwable)
 | 
			
		||||
    }
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> Any) {
 | 
			
		||||
        val message = messageBuilder()
 | 
			
		||||
        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, tag, message, throwable)
 | 
			
		||||
    }
 | 
			
		||||
    override suspend fun performLogS(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: suspend () -> Any) {
 | 
			
		||||
        val message = messageBuilder()
 | 
			
		||||
        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, tag, message, throwable)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										28
									
								
								src/commonMain/kotlin/typed/TypedKSLogBuilder.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								src/commonMain/kotlin/typed/TypedKSLogBuilder.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,28 @@
 | 
			
		||||
package dev.inmo.kslog.common.typed
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.*
 | 
			
		||||
import kotlin.reflect.KClass
 | 
			
		||||
 | 
			
		||||
class TypedKSLogBuilder(
 | 
			
		||||
    private val preset: Map<KClass<*>?, KSLog> = emptyMap()
 | 
			
		||||
) {
 | 
			
		||||
    private val loggers = mutableMapOf<KClass<*>?, KSLog>().apply {
 | 
			
		||||
        putAll(preset)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun on(kClass: KClass<*>?, with: KSLog) = loggers.put(kClass, with)
 | 
			
		||||
    fun on(kClass: KClass<*>?, with: SimpleKSLogCallback) = loggers.put(kClass, CallbackKSLog(with))
 | 
			
		||||
 | 
			
		||||
    fun default(with: KSLog) = on(null, with)
 | 
			
		||||
    fun default(with: SimpleKSLogCallback) = on(null, with)
 | 
			
		||||
 | 
			
		||||
    inline fun <reified T: Any> on(with: KSLog) = on(T::class, with)
 | 
			
		||||
    inline fun <reified T: Any> on(noinline with: SimpleKSLogCallback) = on(T::class, with)
 | 
			
		||||
 | 
			
		||||
    fun build() = TypedKSLog(loggers.toMap())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
inline fun buildTypedLogger(
 | 
			
		||||
    preset: Map<KClass<*>?, KSLog> = emptyMap(),
 | 
			
		||||
    block: TypedKSLogBuilder.() -> Unit
 | 
			
		||||
) = TypedKSLogBuilder(preset).apply(block).build()
 | 
			
		||||
							
								
								
									
										15
									
								
								src/commonMain/kotlin/utils/Combination.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								src/commonMain/kotlin/utils/Combination.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,15 @@
 | 
			
		||||
package dev.inmo.kslog.common.utils
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.CallbackKSLog
 | 
			
		||||
import dev.inmo.kslog.common.KSLog
 | 
			
		||||
 | 
			
		||||
infix operator fun KSLog.plus(other: KSLog) = CallbackKSLog { l, t, m, e ->
 | 
			
		||||
    val resultOfFirst = runCatching {
 | 
			
		||||
        this@plus.performLog(l, t, m, e)
 | 
			
		||||
    }
 | 
			
		||||
    val resultOfSecond = runCatching {
 | 
			
		||||
        other.performLog(l, t, m, e)
 | 
			
		||||
    }
 | 
			
		||||
    resultOfFirst.onFailure { throw it }
 | 
			
		||||
    resultOfSecond.onFailure { throw it }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,15 +1,9 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
actual fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: MessageFilter,
 | 
			
		||||
    messageFormatter: MessageFormatter
 | 
			
		||||
): KSLog = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t, m, e)) return@KSLog
 | 
			
		||||
    val text = messageFormatter(l, t?:defaultTag, m, e)
 | 
			
		||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
 | 
			
		||||
    val args = e ?.let {
 | 
			
		||||
        arrayOf(text, e)
 | 
			
		||||
    } ?: arrayOf(text)
 | 
			
		||||
        arrayOf(m, e)
 | 
			
		||||
    } ?: arrayOf(m)
 | 
			
		||||
    when (l) {
 | 
			
		||||
        LogLevel.DEBUG -> console.log(*args)
 | 
			
		||||
        LogLevel.VERBOSE,
 | 
			
		||||
 
 | 
			
		||||
@@ -1,17 +1,15 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import dev.inmo.kslog.common.filter.filtered
 | 
			
		||||
import java.util.logging.Level
 | 
			
		||||
import java.util.logging.Logger
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    filter: MessageFilter = { _, _, _, _ -> true },
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
) = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t, m, e)) return@KSLog
 | 
			
		||||
    val text = messageFormatter(l,t ?: defaultTag,m,e)
 | 
			
		||||
    logger.log(
 | 
			
		||||
private val defaultKSLogLogger by lazy {
 | 
			
		||||
    Logger.getLogger("KSLog")
 | 
			
		||||
}
 | 
			
		||||
private fun Logger.doLog(
 | 
			
		||||
    l: LogLevel, t: String, m: String, e: Throwable?
 | 
			
		||||
) = log(
 | 
			
		||||
    when(l) {
 | 
			
		||||
        LogLevel.DEBUG -> Level.FINEST
 | 
			
		||||
        LogLevel.VERBOSE -> Level.FINE
 | 
			
		||||
@@ -20,9 +18,32 @@ fun KSLog(
 | 
			
		||||
        LogLevel.ERROR -> Level.SEVERE
 | 
			
		||||
        LogLevel.ASSERT -> Level.SEVERE
 | 
			
		||||
    },
 | 
			
		||||
        text,
 | 
			
		||||
    m,
 | 
			
		||||
    e
 | 
			
		||||
    )
 | 
			
		||||
)
 | 
			
		||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
 | 
			
		||||
    defaultKSLogLogger.doLog(l, t, m.toString(), e)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Deprecated("Filtering should be replaced with FilterKSLog")
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    filter: MessageFilter,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
) = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t, e)) return@KSLog
 | 
			
		||||
    val text = messageFormatter(l,t ?: defaultTag,m.toString(),e)
 | 
			
		||||
    logger.doLog(l, t ?: defaultTag, text, e)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
) = KSLog { l, t, m, e ->
 | 
			
		||||
    val text = messageFormatter(l,t ?: defaultTag,m.toString(),e)
 | 
			
		||||
    logger.doLog(l, t ?: defaultTag, text, e)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
@@ -32,9 +53,7 @@ fun KSLog(
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog {
 | 
			
		||||
    val levels = levels.toSet()
 | 
			
		||||
    return KSLog (defaultTag, logger, { l, _, _, _ ->
 | 
			
		||||
        l in levels
 | 
			
		||||
    }, messageFormatter)
 | 
			
		||||
    return KSLog (defaultTag, logger, messageFormatter).filtered { l, _, _ -> l in levels }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
@@ -51,12 +70,4 @@ fun KSLog(
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    minLoggingLevel: LogLevel = LogLevel.values().first(),
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog = KSLog (defaultTag, logger, { l, _, _, _ ->
 | 
			
		||||
    minLoggingLevel.ordinal <= l.ordinal
 | 
			
		||||
}, messageFormatter)
 | 
			
		||||
 | 
			
		||||
actual fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: MessageFilter,
 | 
			
		||||
    messageFormatter: MessageFormatter
 | 
			
		||||
): KSLog = KSLog(defaultTag, Logger.getLogger("KSLog"), filter, messageFormatter)
 | 
			
		||||
): KSLog = KSLog (defaultTag, logger, messageFormatter).filtered { l, _, _ -> minLoggingLevel.ordinal <= l.ordinal }
 | 
			
		||||
 
 | 
			
		||||
@@ -2,20 +2,15 @@ package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import android.util.Log
 | 
			
		||||
 | 
			
		||||
actual fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: MessageFilter,
 | 
			
		||||
    messageFormatter: MessageFormatter
 | 
			
		||||
): KSLog = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t ?: defaultTag, m, e)) return@KSLog
 | 
			
		||||
    val tag = t ?: defaultTag
 | 
			
		||||
    val text = messageFormatter(l, tag, m, e)
 | 
			
		||||
 | 
			
		||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
 | 
			
		||||
    val messageString = m.toString()
 | 
			
		||||
    when(l) {
 | 
			
		||||
        LogLevel.DEBUG -> Log.d(tag, text, e)
 | 
			
		||||
        LogLevel.VERBOSE -> Log.v(tag, text, e)
 | 
			
		||||
        LogLevel.INFO -> Log.i(tag, text, e)
 | 
			
		||||
        LogLevel.WARNING -> Log.w(tag, text, e)
 | 
			
		||||
        LogLevel.ERROR -> Log.e(tag, text, e)
 | 
			
		||||
        LogLevel.ASSERT -> Log.wtf(tag, text, e)
 | 
			
		||||
        LogLevel.DEBUG -> Log.d(t, messageString, e)
 | 
			
		||||
        LogLevel.VERBOSE -> Log.v(t, messageString, e)
 | 
			
		||||
        LogLevel.INFO -> Log.i(t, messageString, e)
 | 
			
		||||
        LogLevel.WARNING -> Log.w(t, messageString, e)
 | 
			
		||||
        LogLevel.ERROR -> Log.e(t, messageString, e)
 | 
			
		||||
        LogLevel.ASSERT -> Log.wtf(t, messageString, e)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user