mirror of
				https://github.com/InsanusMokrassar/KSLog.git
				synced 2025-11-04 05:20:38 +00:00 
			
		
		
		
	Compare commits
	
		
			26 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| effeaa7ef7 | |||
| 602ba0e1c8 | |||
| de7f735ad0 | |||
| 10576d32f6 | |||
| 88859ffab8 | |||
| 240dec3935 | |||
| 444b91676d | |||
| 33a0d9032f | |||
| be047cb8b5 | |||
| f5cc748ac5 | |||
| f967c1648f | |||
| f542dba025 | |||
| 5f13b11efc | |||
| 612e4719f0 | |||
| eef966fc30 | |||
| 03b18d005f | |||
| 95779af7b6 | |||
| 3f600f3691 | |||
| 9441f77b18 | |||
| de56994cf7 | |||
| c15d7f23e2 | |||
| 63b29d3665 | |||
| 2b79b6d060 | |||
| 82085783c0 | |||
| 5f49b183e0 | |||
| 365acacbd2 | 
							
								
								
									
										2
									
								
								.github/workflows/kdocs.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/kdocs.yml
									
									
									
									
										vendored
									
									
								
							@@ -17,5 +17,5 @@ jobs:
 | 
			
		||||
        uses: peaceiris/actions-gh-pages@v3
 | 
			
		||||
        with:
 | 
			
		||||
          github_token: ${{ secrets.GITHUB_TOKEN }}
 | 
			
		||||
          publish_dir: ./docs/build/dokka/html
 | 
			
		||||
          publish_dir: ./build/dokka/html
 | 
			
		||||
          publish_branch: kdocs
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										29
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,34 @@
 | 
			
		||||
# Changelog
 | 
			
		||||
 | 
			
		||||
## 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
 | 
			
		||||
 | 
			
		||||
* Full rewrite of API
 | 
			
		||||
 | 
			
		||||
## 0.1.1
 | 
			
		||||
 | 
			
		||||
* Changes in `JVM` levels
 | 
			
		||||
* Fixes in TagLogger
 | 
			
		||||
 | 
			
		||||
## 0.1.0
 | 
			
		||||
 | 
			
		||||
* All the platform specific logged factories has been renamed
 | 
			
		||||
 | 
			
		||||
## 0.0.3
 | 
			
		||||
 | 
			
		||||
* Fixes in `JVM` logging
 | 
			
		||||
 | 
			
		||||
## 0.0.2
 | 
			
		||||
 | 
			
		||||
* New logger `TagLogger` and now extension `Any#logger` will use it to decrease objects allocations
 | 
			
		||||
* Now it is possible to create `KSLog` using any iterable
 | 
			
		||||
* Now it is possible to create `KSLog` using vararg log levels
 | 
			
		||||
 | 
			
		||||
## 0.0.1
 | 
			
		||||
 | 
			
		||||
* Project has been inited
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,9 @@
 | 
			
		||||

 | 
			
		||||

 | 
			
		||||
 | 
			
		||||
[](https://insanusmokrassar.github.io/KSLog/)
 | 
			
		||||
[](https://bookstack.inmo.dev/books/kslog)
 | 
			
		||||
 | 
			
		||||
It is simple logging tool which is using built-in tools for logging:
 | 
			
		||||
 | 
			
		||||
* `java.util.logging.Logger` for `JVM`
 | 
			
		||||
 
 | 
			
		||||
@@ -9,5 +9,5 @@ android.enableJetifier=true
 | 
			
		||||
# Project data
 | 
			
		||||
 | 
			
		||||
group=dev.inmo
 | 
			
		||||
version=0.0.1
 | 
			
		||||
android_code_version=1
 | 
			
		||||
version=0.3.0
 | 
			
		||||
android_code_version=7
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,5 @@ package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
val Any.logTag
 | 
			
		||||
    get() = this::class.simpleName ?: error("Unable to retrieve log tag")
 | 
			
		||||
val Any.logger
 | 
			
		||||
    get() = CallbackKSLog { l, t, m, e ->
 | 
			
		||||
        KSLog.default.performLog(l, t ?: logTag, m, e)
 | 
			
		||||
    }
 | 
			
		||||
val Any.logger: KSLog
 | 
			
		||||
    get() = TagLogger(logTag)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								src/commonMain/kotlin/CallbackKSLog.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								src/commonMain/kotlin/CallbackKSLog.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
class CallbackKSLog(
 | 
			
		||||
    private val performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										40
									
								
								src/commonMain/kotlin/DefaultKSLog.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								src/commonMain/kotlin/DefaultKSLog.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,40 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
class DefaultKSLog(
 | 
			
		||||
    private val defaultTag: String,
 | 
			
		||||
    val filter: MessageFilter = { _, _, _ -> true },
 | 
			
		||||
    private val messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
    private val logging: (level: LogLevel, tag: String, message: String, throwable: Throwable?) -> Unit = defaultLogging
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) {
 | 
			
		||||
        val tag = tag ?: defaultTag
 | 
			
		||||
 | 
			
		||||
        if (filter(level, tag, throwable)) {
 | 
			
		||||
            val text = messageFormatter(level, tag, message, throwable)
 | 
			
		||||
            logging(level, tag, text, throwable)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> String) {
 | 
			
		||||
        val tag = tag ?: defaultTag
 | 
			
		||||
 | 
			
		||||
        if (filter(level, tag, throwable)) {
 | 
			
		||||
            val text = messageFormatter(level, tag, messageBuilder(), throwable)
 | 
			
		||||
            logging(level, tag, text, throwable)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override suspend fun performLogS(
 | 
			
		||||
        level: LogLevel,
 | 
			
		||||
        tag: String?,
 | 
			
		||||
        throwable: Throwable?,
 | 
			
		||||
        messageBuilder: suspend () -> String
 | 
			
		||||
    ) {
 | 
			
		||||
        val tag = tag ?: defaultTag
 | 
			
		||||
 | 
			
		||||
        if (filter(level, tag, throwable)) {
 | 
			
		||||
            val text = messageFormatter(level, tag, messageBuilder(), throwable)
 | 
			
		||||
            logging(level, tag, text, throwable)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -2,72 +2,86 @@
 | 
			
		||||
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = performLog(level, tag, messageBuilder(), e)
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, message: String, e: Throwable? = null) = log(level, null, e) { message }
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String, message: String, e: Throwable? = null) = log(level, tag, e) { message }
 | 
			
		||||
inline fun KSLog.log(level: LogLevel, tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = performLog(level, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.logS(level: LogLevel, tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = performLogS(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.verbose(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.VERBOSE, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.debug(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.DEBUG, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.debugS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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.verbose(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.VERBOSE, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.verboseS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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.info(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.INFO, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.info(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.INFO, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.infoS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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.warning(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.WARNING, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.warning(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.WARNING, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.warningS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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.error(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.ERROR, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.error(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.ERROR, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.errorS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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.assert(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.ASSERT, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.assert(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(LogLevel.ASSERT, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.assertS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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.debug(tag: String? = null, e: Throwable? = null, 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)
 | 
			
		||||
 | 
			
		||||
// ----- Short names
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(level, tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.l(level: LogLevel, tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = log(level, tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.lS(level: LogLevel, tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = logS(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, messageBuilder: () -> String) = verbose(tag, e, messageBuilder)
 | 
			
		||||
 | 
			
		||||
inline fun KSLog.d(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = debug(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.dS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = debugS(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.v(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = verbose(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.vS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = verboseS(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.i(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = info(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.i(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = info(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.iS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = infoS(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.w(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = warning(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.w(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = warning(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = warningS(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.e(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = error(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.e(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = error(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.eS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = errorS(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.wtf(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = assert(tag, e, messageBuilder)
 | 
			
		||||
inline fun KSLog.wtf(tag: String? = null, e: Throwable? = null, noinline messageBuilder: () -> String) = assert(tag, e, messageBuilder)
 | 
			
		||||
suspend inline fun KSLog.wtfS(tag: String? = null, e: Throwable? = null, noinline messageBuilder: suspend () -> String) = assertS(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.d(tag: String? = null, e: Throwable? = null, 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)
 | 
			
		||||
 
 | 
			
		||||
@@ -2,16 +2,29 @@ package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
enum class LogLevel {
 | 
			
		||||
    DEBUG,
 | 
			
		||||
    VERBOSE,
 | 
			
		||||
    INFO,
 | 
			
		||||
    WARNING,
 | 
			
		||||
    ERROR,
 | 
			
		||||
    ASSERT,
 | 
			
		||||
    DEBUG
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
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?,
 | 
			
		||||
        throwable: Throwable?,
 | 
			
		||||
        messageBuilder: () -> String
 | 
			
		||||
    ) = performLog(level, tag, messageBuilder(), throwable)
 | 
			
		||||
    suspend fun performLogS(
 | 
			
		||||
        level: LogLevel,
 | 
			
		||||
        tag: String?,
 | 
			
		||||
        throwable: Throwable?,
 | 
			
		||||
        messageBuilder: suspend () -> String
 | 
			
		||||
    ) = performLog(level, tag, messageBuilder(), throwable)
 | 
			
		||||
    companion object : KSLog {
 | 
			
		||||
        private var defaultLogger: KSLog? = null
 | 
			
		||||
        var default: KSLog
 | 
			
		||||
@@ -24,34 +37,64 @@ interface KSLog {
 | 
			
		||||
                defaultLogger = value
 | 
			
		||||
            }
 | 
			
		||||
        override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = default.performLog(level, tag, message, throwable)
 | 
			
		||||
        override fun performLog(level: LogLevel, message: String, throwable: Throwable?) = default.performLog(level, message, throwable)
 | 
			
		||||
        override fun performLog(
 | 
			
		||||
            level: LogLevel,
 | 
			
		||||
            tag: String?,
 | 
			
		||||
            throwable: Throwable?,
 | 
			
		||||
            messageBuilder: () -> String
 | 
			
		||||
        ) = default.performLog(level, tag, throwable, messageBuilder)
 | 
			
		||||
        override suspend fun performLogS(
 | 
			
		||||
            level: LogLevel,
 | 
			
		||||
            tag: String?,
 | 
			
		||||
            throwable: Throwable?,
 | 
			
		||||
            messageBuilder: suspend () -> String
 | 
			
		||||
        ) = default.performLogS(level, tag, throwable, messageBuilder)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
 | 
			
		||||
 | 
			
		||||
class CallbackKSLog(
 | 
			
		||||
    private val performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit
 | 
			
		||||
) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
expect fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
 | 
			
		||||
) : KSLog
 | 
			
		||||
internal expect val defaultLogging: (level: LogLevel, tag: String, message: String, throwable: Throwable?) -> Unit
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    levels: Set<LogLevel>
 | 
			
		||||
): KSLog = KSLog (defaultTag) { l, _, _, _ ->
 | 
			
		||||
    filter: MessageFilter = { _, _, _ -> true },
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog = DefaultKSLog(
 | 
			
		||||
    defaultTag,
 | 
			
		||||
    filter,
 | 
			
		||||
    messageFormatter
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    levels: Iterable<LogLevel>,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog {
 | 
			
		||||
    val levels = levels.toSet()
 | 
			
		||||
    return KSLog (defaultTag, { l, _, _ ->
 | 
			
		||||
        l in levels
 | 
			
		||||
    }, messageFormatter)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    minLoggingLevel: LogLevel = LogLevel.VERBOSE
 | 
			
		||||
): KSLog = KSLog (defaultTag) { l, _, _, _ ->
 | 
			
		||||
    firstLevel: LogLevel,
 | 
			
		||||
    secondLevel: LogLevel,
 | 
			
		||||
    vararg otherLevels: LogLevel,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
): KSLog = KSLog(defaultTag, setOf(firstLevel, secondLevel, *otherLevels), messageFormatter)
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    minLoggingLevel: LogLevel,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
): KSLog = KSLog (
 | 
			
		||||
    defaultTag,
 | 
			
		||||
    { l, _, _ ->
 | 
			
		||||
        minLoggingLevel.ordinal <= l.ordinal
 | 
			
		||||
}
 | 
			
		||||
    },
 | 
			
		||||
    messageFormatter
 | 
			
		||||
)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								src/commonMain/kotlin/KSLogTypealiases.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								src/commonMain/kotlin/KSLogTypealiases.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
typealias MessageFormatter = (l: LogLevel, t: String, m: String, Throwable?) -> String
 | 
			
		||||
typealias MessageFilter = (l: LogLevel, t: String?, Throwable?) -> Boolean
 | 
			
		||||
val defaultMessageFormatter: MessageFormatter = { l, t, m, _ -> "[$l] $t - $m" }
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								src/commonMain/kotlin/TagLogger.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								src/commonMain/kotlin/TagLogger.kt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,10 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import kotlin.jvm.JvmInline
 | 
			
		||||
 | 
			
		||||
@JvmInline
 | 
			
		||||
value class TagLogger(val tag: String) : KSLog {
 | 
			
		||||
    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) {
 | 
			
		||||
        KSLog.performLog(level, tag ?: this.tag, message, throwable)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,30 +1,15 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    messageFormatter: (l: LogLevel, t: String?, m: String, Throwable?) -> String,
 | 
			
		||||
    filter: (l: LogLevel, t: String?, m: String, Throwable?) -> Boolean
 | 
			
		||||
) = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t, m, e)) return@KSLog
 | 
			
		||||
    val text = messageFormatter(l,t,m,e)
 | 
			
		||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: String, 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,
 | 
			
		||||
        LogLevel.INFO -> console.info(*args)
 | 
			
		||||
        LogLevel.WARNING -> console.warn(*args)
 | 
			
		||||
        LogLevel.ERROR,
 | 
			
		||||
        LogLevel.ASSERT -> console.error(*args)
 | 
			
		||||
        LogLevel.DEBUG -> console.log(*args)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
actual fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
 | 
			
		||||
): KSLog {
 | 
			
		||||
    return KSLog(
 | 
			
		||||
        { l, t, m, _ -> "[$l] ${t ?: defaultTag} - $m" },
 | 
			
		||||
        { l, t, m, e -> filter(l, t ?: defaultTag, m, e) }
 | 
			
		||||
    )
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,46 +1,62 @@
 | 
			
		||||
package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import java.util.logging.Level
 | 
			
		||||
import java.util.logging.Logger
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    logger: java.util.logging.Logger,
 | 
			
		||||
    filter: (l: LogLevel, t: String?, m: String, Throwable?) -> Boolean,
 | 
			
		||||
    messageFormatter: (l: LogLevel, t: String?, m: String, Throwable?) -> String
 | 
			
		||||
) = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t, m, e)) return@KSLog
 | 
			
		||||
    val text = messageFormatter(l,t,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.VERBOSE -> Level.FINEST
 | 
			
		||||
        LogLevel.DEBUG -> Level.FINEST
 | 
			
		||||
        LogLevel.VERBOSE -> Level.FINE
 | 
			
		||||
        LogLevel.INFO -> Level.INFO
 | 
			
		||||
        LogLevel.WARNING -> Level.WARNING
 | 
			
		||||
        LogLevel.ERROR -> Level.SEVERE
 | 
			
		||||
            LogLevel.ASSERT -> Level.OFF
 | 
			
		||||
            LogLevel.DEBUG -> Level.ALL
 | 
			
		||||
        LogLevel.ASSERT -> Level.SEVERE
 | 
			
		||||
    },
 | 
			
		||||
        text,
 | 
			
		||||
    m,
 | 
			
		||||
    e
 | 
			
		||||
    )
 | 
			
		||||
)
 | 
			
		||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: String, throwable: Throwable?) -> Unit = { l, t, m, e ->
 | 
			
		||||
    defaultKSLogLogger.doLog(l, t, m, e)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    logger: java.util.logging.Logger,
 | 
			
		||||
    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean = { _, _, _, _ -> true }
 | 
			
		||||
): KSLog {
 | 
			
		||||
    return KSLog(
 | 
			
		||||
        logger,
 | 
			
		||||
        { l, t, m, e -> filter(l, t ?: defaultTag, m, e) }
 | 
			
		||||
    ) { _, t, m, _ -> "${t ?: defaultTag} - $m" }
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    filter: MessageFilter = { _, _, _ -> true },
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
) = KSLog { l, t, m, e ->
 | 
			
		||||
    if (!filter(l, t, e)) return@KSLog
 | 
			
		||||
    val text = messageFormatter(l,t ?: defaultTag,m,e)
 | 
			
		||||
    logger.doLog(l, t ?: defaultTag, text, e)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
actual fun KSLog(
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    levels: Iterable<LogLevel>,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog {
 | 
			
		||||
    return KSLog(
 | 
			
		||||
        defaultTag,
 | 
			
		||||
        logger = java.util.logging.Logger.getAnonymousLogger(),
 | 
			
		||||
        filter = { l, t, m, e -> filter(l, t, m, e) }
 | 
			
		||||
    )
 | 
			
		||||
    val levels = levels.toSet()
 | 
			
		||||
    return KSLog (defaultTag, logger, { l, _, _ -> l in levels }, messageFormatter)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    firstLevel: LogLevel,
 | 
			
		||||
    secondLevel: LogLevel,
 | 
			
		||||
    vararg otherLevels: LogLevel,
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter,
 | 
			
		||||
): KSLog = KSLog (defaultTag, logger, setOf(firstLevel, secondLevel, *otherLevels), messageFormatter)
 | 
			
		||||
 | 
			
		||||
fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    logger: Logger,
 | 
			
		||||
    minLoggingLevel: LogLevel = LogLevel.values().first(),
 | 
			
		||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
			
		||||
): KSLog = KSLog (defaultTag, logger, { l, _, _ -> minLoggingLevel.ordinal <= l.ordinal }, messageFormatter)
 | 
			
		||||
 
 | 
			
		||||
@@ -2,20 +2,14 @@ package dev.inmo.kslog.common
 | 
			
		||||
 | 
			
		||||
import android.util.Log
 | 
			
		||||
 | 
			
		||||
actual fun KSLog(
 | 
			
		||||
    defaultTag: String,
 | 
			
		||||
    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
 | 
			
		||||
): KSLog {
 | 
			
		||||
    return KSLog { l, t, m, e ->
 | 
			
		||||
        val tag = t ?: defaultTag
 | 
			
		||||
        if (!filter(l, t ?: defaultTag, m, e)) return@KSLog
 | 
			
		||||
 | 
			
		||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: String, throwable: Throwable?) -> Unit = { l, t, m, e ->
 | 
			
		||||
    when(l) {
 | 
			
		||||
            LogLevel.VERBOSE -> Log.v(tag, m, e)
 | 
			
		||||
            LogLevel.INFO -> Log.i(tag, m, e)
 | 
			
		||||
            LogLevel.WARNING -> Log.w(tag, m, e)
 | 
			
		||||
            LogLevel.ERROR -> Log.e(tag, m, e)
 | 
			
		||||
            LogLevel.ASSERT -> Log.wtf(tag, m, e)
 | 
			
		||||
            LogLevel.DEBUG -> Log.d(tag, m, e)
 | 
			
		||||
        }
 | 
			
		||||
        LogLevel.DEBUG -> Log.d(t, m, e)
 | 
			
		||||
        LogLevel.VERBOSE -> Log.v(t, m, e)
 | 
			
		||||
        LogLevel.INFO -> Log.i(t, m, e)
 | 
			
		||||
        LogLevel.WARNING -> Log.w(t, m, e)
 | 
			
		||||
        LogLevel.ERROR -> Log.e(t, m, e)
 | 
			
		||||
        LogLevel.ASSERT -> Log.wtf(t, m, e)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user