Skip to content

Commit 5737ea1

Browse files
corneiloshai
authored andcommitted
fixing problem with logger.exit (#85)
* added support for same functionality as slf4j-ext. * fixing signature of exit
1 parent bd217d9 commit 5737ea1

File tree

8 files changed

+14
-12
lines changed

8 files changed

+14
-12
lines changed

settings.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
rootProject.name = "kotlin-logging"
22

3+
enableFeaturePreview("GRADLE_METADATA")
4+
35
buildscript {
46
repositories {
57
mavenCentral()

src/commonMain/kotlin/mu/KLogger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ expect interface KLogger {
118118
/**
119119
* Add a log message with the return value of a method
120120
*/
121-
fun <T> exit(retval: T): T where T : Any
121+
fun <T> exit(retval: T?): T? where T : Any
122122

123123
/**
124124
* Add a log message indicating an exception will be thrown along with the stack trace.

src/jsMain/kotlin/mu/KLogger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ actual interface KLogger {
118118
/**
119119
* Add a log message with the return value of a method
120120
*/
121-
actual fun <T> exit(retval: T): T where T : Any
121+
actual fun <T> exit(retval: T?): T? where T : Any
122122

123123
/**
124124
* Add a log message indicating an exception will be thrown along with the stack trace.

src/jsMain/kotlin/mu/internal/KLoggerJS.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ internal class KLoggerJS(
8484
TRACE.logIfEnabled({ "exit()" }, APPENDER::trace)
8585
}
8686

87-
override fun <T : Any> exit(retval: T): T {
88-
TRACE.logIfEnabled({ "exut($retval)" }, APPENDER::trace)
87+
override fun <T : Any> exit(retval: T?): T? {
88+
TRACE.logIfEnabled({ "exit($retval)" }, APPENDER::trace)
8989
return retval
9090
}
9191

src/jvmMain/kotlin/mu/KLogger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ actual interface KLogger : Logger {
127127
/**
128128
* Add a log message with the return value of a method
129129
*/
130-
actual fun <T> exit(retval: T): T where T : Any
130+
actual fun <T> exit(retval: T?): T? where T : Any
131131

132132
/**
133133
* Add a log message indicating an exception will be thrown along with the stack trace.

src/jvmMain/kotlin/mu/internal/LocationAwareKLogger.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,10 +641,10 @@ internal class LocationAwareKLogger(override val underlyingLogger: LocationAware
641641
}
642642
}
643643

644-
override fun <T: Any> exit(retval: T): T {
644+
override fun <T: Any> exit(retval: T?): T? {
645645
if (underlyingLogger.isTraceEnabled(EXIT)) {
646646
val tp = MessageFormatter.format(EXITMESSAGE, retval)
647-
underlyingLogger.log(EXIT, fqcn, LocationAwareLogger.TRACE_INT, tp.message, arrayOf<Any>(retval), tp.throwable)
647+
underlyingLogger.log(EXIT, fqcn, LocationAwareLogger.TRACE_INT, tp.message, arrayOf<Any?>(retval), tp.throwable)
648648
}
649649
return retval
650650
}

src/jvmMain/kotlin/mu/internal/LocationIgnorantKLogger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ internal class LocationIgnorantKLogger(override val underlyingLogger: Logger)
164164
}
165165
}
166166

167-
override inline fun <T : Any> exit(retval: T): T {
167+
override inline fun <T : Any> exit(retval: T?): T? {
168168
if (underlyingLogger.isTraceEnabled) {
169169
underlyingLogger.trace("exit({}}", retval)
170170
}

src/jvmTest/resources/log4j2.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Configuration status="INFO">
2+
<Configuration status="TRACE">
33
<Appenders>
44
<!-- A1 is a ConsoleAppender, using PatternLayout. -->
55
<Console name="A1" target="SYSTEM_OUT">
6-
<PatternLayout pattern="%-4r [%t] %-5p %c %marker - %m%n" />
6+
<PatternLayout pattern="%-4r [%t] %-5p %c %marker - %m%n"/>
77
</Console>
88
</Appenders>
99
<Loggers>
1010
<!-- Set root logger level to TRACE and its only appender to A1. -->
1111
<Root level="TRACE">
12-
<AppenderRef ref="A1" />
12+
<AppenderRef ref="A1"/>
1313
</Root>
1414
</Loggers>
15-
</Configuration>
15+
</Configuration>

0 commit comments

Comments
 (0)