Skip to content

Commit 9fb169e

Browse files
committed
fix log level check for #276
1 parent 11c1729 commit 9fb169e

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

src/jvmMain/kotlin/io/github/oshai/jul/internal/JulLoggerWrapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
233233
}
234234

235235
override fun warn(msg: String?) {
236-
if (isTraceEnabled) {
236+
if (isWarnEnabled) {
237237
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), msg)
238238
}
239239
}
@@ -280,7 +280,7 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
280280
}
281281

282282
override fun error(msg: String?) {
283-
if (isTraceEnabled) {
283+
if (isErrorEnabled) {
284284
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), msg)
285285
}
286286
}

src/jvmMain/kotlin/io/github/oshai/slf4j/internal/LocationIgnorantKLogger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ internal class LocationIgnorantKLogger(override val underlyingLogger: Logger) :
285285
}
286286

287287
override fun error(msg: String?) {
288-
if (isTraceEnabled) {
288+
if (isErrorEnabled) {
289289
underlyingLogger.error(msg)
290290
}
291291
}

src/jvmTest/kotlin/io/github/oshai/jul/internal/JulLoggerWrapperTest.kt

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class JulLoggerWrapperTest {
1717

1818
companion object {
1919
private lateinit var logger: KLogger
20+
private lateinit var warnLogger: KLogger
21+
private lateinit var errorLogger: KLogger
2022
private val appenderWithWriter: AppenderWithWriter = AppenderWithWriter()
2123

2224
@BeforeAll
@@ -29,6 +31,10 @@ class JulLoggerWrapperTest {
2931
System.setProperty("kotlin-logging-to-jul", "true")
3032
addAppender(appenderWithWriter.appender)
3133
logger = KotlinLogging.logger {}
34+
warnLogger = KotlinLogging.logger("warnLogger")
35+
Logger.getLogger("warnLogger").level = Level.WARNING
36+
errorLogger = KotlinLogging.logger("errorLogger")
37+
Logger.getLogger("errorLogger").level = Level.SEVERE
3238
}
3339

3440
@AfterAll
@@ -42,17 +48,25 @@ class JulLoggerWrapperTest {
4248
@Test
4349
fun testJulLogger() {
4450
assertTrue(logger is JulLoggerWrapper)
45-
logger.info("simple jul message")
51+
assertTrue(warnLogger is JulLoggerWrapper)
52+
assertTrue(errorLogger is JulLoggerWrapper)
53+
logger.info("simple jul info message")
54+
warnLogger.warn("simple jul warn message")
55+
errorLogger.error("simple jul error message")
4656
appenderWithWriter.writer.flush()
47-
assertEquals(
48-
"INFO io.github.oshai.jul.internal.JulLoggerWrapperTest - simple jul message",
57+
val lines =
4958
appenderWithWriter
5059
.writer
5160
.toString()
5261
.trim()
5362
.replace("\r", "\n")
5463
.replace("\n\n", "\n")
55-
.split("\n")[1]
64+
.split("\n")
65+
assertEquals(
66+
"INFO io.github.oshai.jul.internal.JulLoggerWrapperTest - simple jul info message",
67+
lines[1]
5668
)
69+
assertEquals("WARN warnLogger - simple jul warn message", lines[2])
70+
assertEquals("ERROR errorLogger - simple jul error message", lines[3])
5771
}
5872
}

0 commit comments

Comments
 (0)