mirror of
https://github.com/InsanusMokrassar/KSLog.git
synced 2025-10-27 17:40:07 +00:00
Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a71405aff5 | |||
| a2b497d0f9 | |||
| c5974fb51c | |||
| 3240b63f21 | |||
| fffafc4da7 | |||
| b1d5ce2135 | |||
| 0b8db9be35 | |||
| 5030ecc255 | |||
| b5669d2187 | |||
| ed7ad35605 | |||
| 6d5ddafefc | |||
| ee31c61677 | |||
| 1be14aa28e | |||
| 97b432c0b0 | |||
| 74a0ad8fd1 | |||
| 502dd4d607 | |||
| 079fbaa7f4 | |||
| 99dac12a27 | |||
| b0cc6c11ea | |||
| 58161132dc | |||
| 7e45e5d421 | |||
| e7956f6d31 | |||
| 9993fd5fdd | |||
| 9e8665cdc9 | |||
| 63d3cabc9c | |||
| 0b142c7ff9 | |||
| 7a1d934dab | |||
| b3720de8c7 | |||
| 669afe481d | |||
| 42db9da058 | |||
| 72de26adac | |||
| 4b47a4e817 | |||
| 785ab59519 | |||
| a4f2562690 | |||
| 777ae44da5 | |||
| 28d61a7b7c | |||
| 66c5451293 | |||
| 77ca9ce25b | |||
| 194e52f521 | |||
| 34ea0bd91a | |||
| 3ff5d989b7 | |||
| 0e01534562 | |||
| 35e3d02837 | |||
| b255406dba | |||
| 88fa4e3c09 | |||
| 4d9481f07b | |||
| 54e448f5a0 | |||
| 8729acfff3 | |||
| 923add4550 |
8
.github/workflows/publish.yml
vendored
8
.github/workflows/publish.yml
vendored
@@ -8,9 +8,6 @@ jobs:
|
||||
- uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 11
|
||||
- name: Fix android 32.0.0 dx
|
||||
continue-on-error: true
|
||||
run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar
|
||||
- name: Rewrite version
|
||||
run: |
|
||||
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||
@@ -19,6 +16,11 @@ jobs:
|
||||
mv gradle.properties.tmp gradle.properties
|
||||
- name: Build
|
||||
run: ./gradlew build
|
||||
- name: Publish to Gitea
|
||||
continue-on-error: true
|
||||
run: ./gradlew publishAllPublicationsToGiteaRepository
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
- name: Publish
|
||||
continue-on-error: true
|
||||
run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository
|
||||
|
||||
46
CHANGELOG.md
46
CHANGELOG.md
@@ -1,5 +1,51 @@
|
||||
# Changelog
|
||||
|
||||
## 1.1.0
|
||||
|
||||
* `Kotlin`: `1.8.20`
|
||||
* Standard factory `KSLog` with `String` arg now use `TagLogger`
|
||||
|
||||
## 1.0.0
|
||||
|
||||
* `Kotlin`: `1.8.0`
|
||||
|
||||
## 0.5.4
|
||||
|
||||
* `Kotlin`: `1.7.22`
|
||||
|
||||
## 0.5.3
|
||||
|
||||
* `Kotlin`: `1.7.20`
|
||||
|
||||
## 0.5.2
|
||||
|
||||
* Add support of next platform:
|
||||
* Linux ARM x64
|
||||
* Linux ARM x32 HFP
|
||||
* Linux x64
|
||||
* WASM x32
|
||||
* MinGW x64
|
||||
* MinGW x86
|
||||
|
||||
## 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**
|
||||
|
||||
23
README.md
23
README.md
@@ -1,18 +1,33 @@
|
||||
# How to use
|
||||
# KSLog
|
||||
|
||||
It is simple and easy-to-use tool for logging on the most popular platforms in Kotlin Multiplatform:
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
[](https://insanusmokrassar.github.io/KSLog/)
|
||||
[](https://bookstack.inmo.dev/books/kslog)
|
||||
|
||||
It is simple logging tool which is using built-in tools for logging:
|
||||
By default, KSLog is using built-in tools for logging on each supported platform:
|
||||
|
||||
* `java.util.logging.Logger` for `JVM`
|
||||
* `android.util.Log` for `Android`
|
||||
* `Console` for `JS`
|
||||
|
||||
But you always may create your logger and customize as you wish:
|
||||
|
||||
```kotlin
|
||||
KSLog.default = KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
|
||||
// do your logging
|
||||
}
|
||||
```
|
||||
|
||||
**This library also supports native targets in experimental mode. By default all native targets will use simple printing in the console**
|
||||
|
||||
## How to use
|
||||
|
||||
### Fast-travel
|
||||
@@ -39,9 +54,11 @@ KSLog.l(LogLevel.INFO, "Some optional tag", IllegalArgumentException("So, that i
|
||||
|
||||
There are several important "terms" in context of this library:
|
||||
|
||||
* Default logger (available via `KSLog.default`)
|
||||
* Default logger (available via `KSLog.default` or simply `KSLog`)
|
||||
* Local logger (can be created via `KSLog` functions and passed anywhere as `KSLog`)
|
||||
* Logging shortcuts like `KSLog.i`/`KSLog.info`
|
||||
* Built-in extension `Any.logger` which allow you to create logger binded to the default with the tag based on the class of receiver
|
||||
* __Be careful with the receivers: if you will use some extension like `apply`, the receiver will be different with your class inside of that `apply`__
|
||||
|
||||
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.
|
||||
|
||||
|
||||
@@ -47,6 +47,12 @@ kotlin {
|
||||
android {
|
||||
publishAllLibraryVariants()
|
||||
}
|
||||
linuxArm64()
|
||||
linuxArm32Hfp()
|
||||
linuxX64()
|
||||
wasm32()
|
||||
mingwX64()
|
||||
mingwX86()
|
||||
|
||||
sourceSets {
|
||||
commonMain {
|
||||
|
||||
@@ -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}"
|
||||
|
||||
|
||||
@@ -5,9 +5,10 @@ kotlin.incremental=true
|
||||
kotlin.incremental.js=true
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
org.gradle.jvmargs=-Xmx512m
|
||||
|
||||
# Project data
|
||||
|
||||
group=dev.inmo
|
||||
version=0.4.0
|
||||
android_code_version=10
|
||||
version=1.1.0
|
||||
android_code_version=19
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
[versions]
|
||||
|
||||
kotlin = "1.6.21"
|
||||
kotlin-gradle-plugin = "7.0.4"
|
||||
kotlin = "1.8.20"
|
||||
kotlin-gradle-plugin = "7.3.1"
|
||||
|
||||
dokka = "1.8.10"
|
||||
|
||||
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"
|
||||
android-compileSdk = "33"
|
||||
android-buildTools = "33.0.1"
|
||||
|
||||
github-release = "2.4.1"
|
||||
|
||||
@@ -29,10 +31,10 @@ android-test-espresso-core = { module = "androidx.test.espresso:espresso-core",
|
||||
android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "kotlin-gradle-plugin" }
|
||||
android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
|
||||
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
|
||||
kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlin" }
|
||||
kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
|
||||
github-release = { module = "com.github.breadmoirai:github-release", version.ref = "github-release" }
|
||||
|
||||
[plugins]
|
||||
|
||||
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
||||
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
|
||||
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
|
||||
|
||||
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.5-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -49,20 +49,40 @@ publishing {
|
||||
maven {
|
||||
name = "GithubPackages"
|
||||
url = uri("https://maven.pkg.github.com/InsanusMokrassar/KSLog")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
|
||||
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"Simple logging library for kotlin","url":"https://github.com/InsanusMokrassar/KSLog","vcsUrl":"https://github.com/InsanusMokrassar/KSLog.git","developers":[{"id":"Akkihi","name":"Akkihi","eMail":"akkihiguy@gmail.com"},{"id":"InsanusMokrassar","name":"InsanusMokrassar","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/KSLog"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
|
||||
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"Simple logging library for kotlin","url":"https://github.com/InsanusMokrassar/KSLog","vcsUrl":"https://github.com/InsanusMokrassar/KSLog.git","developers":[{"id":"Akkihi","name":"Akkihi","eMail":"akkihiguy@gmail.com"},{"id":"InsanusMokrassar","name":"InsanusMokrassar","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/KSLog"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
|
||||
@@ -7,3 +7,7 @@ class CallbackKSLog(
|
||||
) : KSLog {
|
||||
override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
|
||||
}
|
||||
|
||||
fun KSLog(
|
||||
performLogCallback: SimpleKSLogCallback
|
||||
) = CallbackKSLog(performLogCallback)
|
||||
|
||||
@@ -3,113 +3,183 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
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? = null) = performLog(level, message, e)
|
||||
inline fun KSLog.log(level: LogLevel, tag: String, message: Any, e: Throwable? = null) = performLog(level, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.debug(message: Any, e: Throwable? = null) = log(LogLevel.DEBUG, message, e)
|
||||
inline fun KSLog.debug(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.DEBUG, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.verbose(message: Any, e: Throwable? = null) = log(LogLevel.VERBOSE, message, e)
|
||||
inline fun KSLog.verbose(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.VERBOSE, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.info(message: Any, e: Throwable? = null) = log(LogLevel.INFO, message, e)
|
||||
inline fun KSLog.info(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.INFO, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.warning(message: Any, e: Throwable? = null) = log(LogLevel.WARNING, message, e)
|
||||
inline fun KSLog.warning(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.WARNING, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.error(message: Any, e: Throwable? = null) = log(LogLevel.ERROR, message, e)
|
||||
inline fun KSLog.error(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.ERROR, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.assert(message: Any, e: Throwable? = null) = log(LogLevel.ASSERT, message, e)
|
||||
inline fun KSLog.assert(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.ASSERT, tag, message, e)
|
||||
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?, 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? = null) = log(level, message, e)
|
||||
inline fun KSLog.l(level: LogLevel, tag: String, message: Any, e: Throwable? = null) = log(level, tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.d(message: Any, e: Throwable? = null) = debug(message, e)
|
||||
inline fun KSLog.d(tag: String, message: Any, e: Throwable? = null) = debug(tag, message, e)
|
||||
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)
|
||||
inline fun KSLog.v(message: Any, e: Throwable? = null) = verbose(message, e)
|
||||
inline fun KSLog.v(tag: String, message: Any, e: Throwable? = null) = verbose(tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.i(message: Any, e: Throwable? = null) = info(message, e)
|
||||
inline fun KSLog.i(tag: String, message: Any, e: Throwable? = null) = info(tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.w(message: Any, e: Throwable? = null) = warning(message, e)
|
||||
inline fun KSLog.w(tag: String, message: Any, e: Throwable? = null) = warning(tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.e(message: Any, e: Throwable? = null) = error(message, e)
|
||||
inline fun KSLog.e(tag: String, message: Any, e: Throwable? = null) = error(tag, message, e)
|
||||
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.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)
|
||||
inline fun KSLog.wtf(message: Any, e: Throwable? = null) = assert(message, e)
|
||||
inline fun KSLog.wtf(tag: String, message: Any, e: Throwable? = null) = assert(tag, message, e)
|
||||
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,6 +1,7 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
import dev.inmo.kslog.common.filter.filtered
|
||||
import dev.inmo.kslog.common.utils.plus
|
||||
|
||||
|
||||
enum class LogLevel {
|
||||
@@ -61,10 +62,17 @@ interface KSLog {
|
||||
operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: Any, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
|
||||
|
||||
internal expect val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
internal val printlnLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
|
||||
println(defaultMessageFormatter(l, t, m, e))
|
||||
}
|
||||
|
||||
fun KSLog(
|
||||
defaultTag: String,
|
||||
messageFormatter: MessageFormatter = defaultMessageFormatter
|
||||
): KSLog = TagLogger(defaultTag)
|
||||
|
||||
fun KSLog(
|
||||
defaultTag: String,
|
||||
messageFormatter: MessageFormatter
|
||||
): KSLog = DefaultKSLog(
|
||||
defaultTag,
|
||||
messageFormatter
|
||||
@@ -75,11 +83,10 @@ fun KSLog(
|
||||
defaultTag: String,
|
||||
filter: MessageFilter,
|
||||
messageFormatter: MessageFormatter = defaultMessageFormatter
|
||||
): KSLog = DefaultKSLog(
|
||||
): KSLog = KSLog (
|
||||
defaultTag,
|
||||
filter,
|
||||
messageFormatter
|
||||
)
|
||||
).filtered(filter)
|
||||
|
||||
fun KSLog(
|
||||
defaultTag: String,
|
||||
@@ -110,3 +117,6 @@ fun KSLog(
|
||||
).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: Any, Throwable?) -> String
|
||||
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 - $m" }
|
||||
|
||||
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()}" } ?: ""}" }
|
||||
|
||||
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 }
|
||||
}
|
||||
4
src/linuxArm32HfpMain/kotlin/DefaultLoggingActual.kt
Normal file
4
src/linuxArm32HfpMain/kotlin/DefaultLoggingActual.kt
Normal file
@@ -0,0 +1,4 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
get() = printlnLogging
|
||||
4
src/linuxArm64Main/kotlin/defaultLogging.kt
Normal file
4
src/linuxArm64Main/kotlin/defaultLogging.kt
Normal file
@@ -0,0 +1,4 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
get() = printlnLogging
|
||||
4
src/linuxX64Main/kotlin/defaultLogging.kt
Normal file
4
src/linuxX64Main/kotlin/defaultLogging.kt
Normal file
@@ -0,0 +1,4 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
get() = printlnLogging
|
||||
4
src/mingwX64Main/kotlin/defaultLogging.kt
Normal file
4
src/mingwX64Main/kotlin/defaultLogging.kt
Normal file
@@ -0,0 +1,4 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
get() = printlnLogging
|
||||
4
src/mingwX86Main/kotlin/defaultLogging.kt
Normal file
4
src/mingwX86Main/kotlin/defaultLogging.kt
Normal file
@@ -0,0 +1,4 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
get() = printlnLogging
|
||||
4
src/wasm32Main/kotlin/defaultLogging.kt
Normal file
4
src/wasm32Main/kotlin/defaultLogging.kt
Normal file
@@ -0,0 +1,4 @@
|
||||
package dev.inmo.kslog.common
|
||||
|
||||
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||
get() = printlnLogging
|
||||
Reference in New Issue
Block a user