Skip to content

Commit af5bcf2

Browse files
oshaioshai
committed
another fix log level check for #276 
1 parent 16a0196 commit af5bcf2

File tree

2 files changed

+105
-103
lines changed

2 files changed

+105
-103
lines changed

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

Lines changed: 67 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.github.oshai.jul.internal
22

33
import io.github.oshai.KLogger
4+
import io.github.oshai.Level.*
45
import io.github.oshai.Marker
56
import io.github.oshai.internal.toStringSafe
67
import java.util.logging.Level
@@ -93,44 +94,44 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
9394

9495
override fun trace(msg: String?) {
9596
if (isTraceEnabled) {
96-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), msg)
97+
underlyingLogger.log(TRACE.toJULLevel(), msg)
9798
}
9899
}
99100

100101
override fun trace(format: String?, arg: Any?) {
101-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), format, arg)
102+
underlyingLogger.log(TRACE.toJULLevel(), format, arg)
102103
}
103104

104105
override fun trace(format: String?, arg1: Any?, arg2: Any?) {
105-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), format, arrayOf(arg1, arg2))
106+
underlyingLogger.log(TRACE.toJULLevel(), format, arrayOf(arg1, arg2))
106107
}
107108

108109
override fun trace(format: String?, vararg arguments: Any?) {
109-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), format, arguments)
110+
underlyingLogger.log(TRACE.toJULLevel(), format, arguments)
110111
}
111112

112113
override fun trace(msg: String?, t: Throwable?) {
113-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), msg, t)
114+
underlyingLogger.log(TRACE.toJULLevel(), msg, t)
114115
}
115116

116117
override fun trace(marker: Marker?, msg: String?) {
117-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), msg)
118+
underlyingLogger.log(TRACE.toJULLevel(), msg)
118119
}
119120

120121
override fun trace(marker: Marker?, format: String?, arg: Any?) {
121-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), format, arg)
122+
underlyingLogger.log(TRACE.toJULLevel(), format, arg)
122123
}
123124

124125
override fun trace(marker: Marker?, format: String?, arg1: Any?, arg2: Any?) {
125-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), format, arrayOf(arg1, arg2))
126+
underlyingLogger.log(TRACE.toJULLevel(), format, arrayOf(arg1, arg2))
126127
}
127128

128129
override fun trace(marker: Marker?, format: String?, vararg argArray: Any?) {
129-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), format, argArray)
130+
underlyingLogger.log(TRACE.toJULLevel(), format, argArray)
130131
}
131132

132133
override fun trace(marker: Marker?, msg: String?, t: Throwable?) {
133-
underlyingLogger.log(io.github.oshai.Level.TRACE.toJULLevel(), msg, t)
134+
underlyingLogger.log(TRACE.toJULLevel(), msg, t)
134135
}
135136

136137
/** Lazy add a log message with a marker and throwable payload if isDebugEnabled is true */
@@ -139,45 +140,45 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
139140
}
140141

141142
override fun debug(msg: String?) {
142-
if (isTraceEnabled) {
143-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), msg)
143+
if (isDebugEnabled) {
144+
underlyingLogger.log(DEBUG.toJULLevel(), msg)
144145
}
145146
}
146147

147148
override fun debug(format: String?, arg: Any?) {
148-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), format, arg)
149+
underlyingLogger.log(DEBUG.toJULLevel(), format, arg)
149150
}
150151

151152
override fun debug(format: String?, arg1: Any?, arg2: Any?) {
152-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), format, arrayOf(arg1, arg2))
153+
underlyingLogger.log(DEBUG.toJULLevel(), format, arrayOf(arg1, arg2))
153154
}
154155

155156
override fun debug(format: String?, vararg arguments: Any?) {
156-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), format, arguments)
157+
underlyingLogger.log(DEBUG.toJULLevel(), format, arguments)
157158
}
158159

159160
override fun debug(msg: String?, t: Throwable?) {
160-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), msg, t)
161+
underlyingLogger.log(DEBUG.toJULLevel(), msg, t)
161162
}
162163

163164
override fun debug(marker: Marker?, msg: String?) {
164-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), msg)
165+
underlyingLogger.log(DEBUG.toJULLevel(), msg)
165166
}
166167

167168
override fun debug(marker: Marker?, format: String?, arg: Any?) {
168-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), format, arg)
169+
underlyingLogger.log(DEBUG.toJULLevel(), format, arg)
169170
}
170171

171172
override fun debug(marker: Marker?, format: String?, arg1: Any?, arg2: Any?) {
172-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), format, arrayOf(arg1, arg2))
173+
underlyingLogger.log(DEBUG.toJULLevel(), format, arrayOf(arg1, arg2))
173174
}
174175

175176
override fun debug(marker: Marker?, format: String?, vararg arguments: Any?) {
176-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), format, arguments)
177+
underlyingLogger.log(DEBUG.toJULLevel(), format, arguments)
177178
}
178179

179180
override fun debug(marker: Marker?, msg: String?, t: Throwable?) {
180-
underlyingLogger.log(io.github.oshai.Level.DEBUG.toJULLevel(), msg, t)
181+
underlyingLogger.log(DEBUG.toJULLevel(), msg, t)
181182
}
182183

183184
/** Lazy add a log message with a marker and throwable payload if isInfoEnabled is true */
@@ -186,45 +187,45 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
186187
}
187188

188189
override fun info(msg: String?) {
189-
if (isTraceEnabled) {
190+
if (isInfoEnabled) {
190191
underlyingLogger.info(msg)
191192
}
192193
}
193194

194195
override fun info(format: String?, arg: Any?) {
195-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), format, arg)
196+
underlyingLogger.log(INFO.toJULLevel(), format, arg)
196197
}
197198

198199
override fun info(format: String?, arg1: Any?, arg2: Any?) {
199-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), format, arrayOf(arg1, arg2))
200+
underlyingLogger.log(INFO.toJULLevel(), format, arrayOf(arg1, arg2))
200201
}
201202

202203
override fun info(format: String?, vararg arguments: Any?) {
203-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), format, arguments)
204+
underlyingLogger.log(INFO.toJULLevel(), format, arguments)
204205
}
205206

206207
override fun info(msg: String?, t: Throwable?) {
207-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), msg, t)
208+
underlyingLogger.log(INFO.toJULLevel(), msg, t)
208209
}
209210

210211
override fun info(marker: Marker?, msg: String?) {
211-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), msg)
212+
underlyingLogger.log(INFO.toJULLevel(), msg)
212213
}
213214

214215
override fun info(marker: Marker?, format: String?, arg: Any?) {
215-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), format, arg)
216+
underlyingLogger.log(INFO.toJULLevel(), format, arg)
216217
}
217218

218219
override fun info(marker: Marker?, format: String?, arg1: Any?, arg2: Any?) {
219-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), format, arrayOf(arg1, arg2))
220+
underlyingLogger.log(INFO.toJULLevel(), format, arrayOf(arg1, arg2))
220221
}
221222

222223
override fun info(marker: Marker?, format: String?, vararg arguments: Any?) {
223-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), format, arguments)
224+
underlyingLogger.log(INFO.toJULLevel(), format, arguments)
224225
}
225226

226227
override fun info(marker: Marker?, msg: String?, t: Throwable?) {
227-
underlyingLogger.log(io.github.oshai.Level.INFO.toJULLevel(), msg, t)
228+
underlyingLogger.log(INFO.toJULLevel(), msg, t)
228229
}
229230

230231
/** Lazy add a log message with a marker and throwable payload if isWarnEnabled is true */
@@ -234,44 +235,44 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
234235

235236
override fun warn(msg: String?) {
236237
if (isWarnEnabled) {
237-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), msg)
238+
underlyingLogger.log(WARN.toJULLevel(), msg)
238239
}
239240
}
240241

241242
override fun warn(format: String?, arg: Any?) {
242-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), format, arg)
243+
underlyingLogger.log(WARN.toJULLevel(), format, arg)
243244
}
244245

245246
override fun warn(format: String?, arg1: Any?, arg2: Any?) {
246-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), format, arrayOf(arg1, arg2))
247+
underlyingLogger.log(WARN.toJULLevel(), format, arrayOf(arg1, arg2))
247248
}
248249

249250
override fun warn(format: String?, vararg arguments: Any?) {
250-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), format, arguments)
251+
underlyingLogger.log(WARN.toJULLevel(), format, arguments)
251252
}
252253

253254
override fun warn(msg: String?, t: Throwable?) {
254-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), msg, t)
255+
underlyingLogger.log(WARN.toJULLevel(), msg, t)
255256
}
256257

257258
override fun warn(marker: Marker?, msg: String?) {
258-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), msg)
259+
underlyingLogger.log(WARN.toJULLevel(), msg)
259260
}
260261

261262
override fun warn(marker: Marker?, format: String?, arg: Any?) {
262-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), format, arg)
263+
underlyingLogger.log(WARN.toJULLevel(), format, arg)
263264
}
264265

265266
override fun warn(marker: Marker?, format: String?, arg1: Any?, arg2: Any?) {
266-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), format, arrayOf(arg1, arg2))
267+
underlyingLogger.log(WARN.toJULLevel(), format, arrayOf(arg1, arg2))
267268
}
268269

269270
override fun warn(marker: Marker?, format: String?, vararg arguments: Any?) {
270-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), format, arguments)
271+
underlyingLogger.log(WARN.toJULLevel(), format, arguments)
271272
}
272273

273274
override fun warn(marker: Marker?, msg: String?, t: Throwable?) {
274-
underlyingLogger.log(io.github.oshai.Level.WARN.toJULLevel(), msg, t)
275+
underlyingLogger.log(WARN.toJULLevel(), msg, t)
275276
}
276277

277278
/** Lazy add a log message with a marker and throwable payload if isErrorEnabled is true */
@@ -281,44 +282,44 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
281282

282283
override fun error(msg: String?) {
283284
if (isErrorEnabled) {
284-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), msg)
285+
underlyingLogger.log(ERROR.toJULLevel(), msg)
285286
}
286287
}
287288

288289
override fun error(format: String?, arg: Any?) {
289-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), format, arg)
290+
underlyingLogger.log(ERROR.toJULLevel(), format, arg)
290291
}
291292

292293
override fun error(format: String?, arg1: Any?, arg2: Any?) {
293-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), format, arrayOf(arg1, arg2))
294+
underlyingLogger.log(ERROR.toJULLevel(), format, arrayOf(arg1, arg2))
294295
}
295296

296297
override fun error(format: String?, vararg arguments: Any?) {
297-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), format, arguments)
298+
underlyingLogger.log(ERROR.toJULLevel(), format, arguments)
298299
}
299300

300301
override fun error(msg: String?, t: Throwable?) {
301-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), msg, t)
302+
underlyingLogger.log(ERROR.toJULLevel(), msg, t)
302303
}
303304

304305
override fun error(marker: Marker?, msg: String?) {
305-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), msg)
306+
underlyingLogger.log(ERROR.toJULLevel(), msg)
306307
}
307308

308309
override fun error(marker: Marker?, format: String?, arg: Any?) {
309-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), format, arg)
310+
underlyingLogger.log(ERROR.toJULLevel(), format, arg)
310311
}
311312

312313
override fun error(marker: Marker?, format: String?, arg1: Any?, arg2: Any?) {
313-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), format, arrayOf(arg1, arg2))
314+
underlyingLogger.log(ERROR.toJULLevel(), format, arrayOf(arg1, arg2))
314315
}
315316

316317
override fun error(marker: Marker?, format: String?, vararg arguments: Any?) {
317-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), format, arguments)
318+
underlyingLogger.log(ERROR.toJULLevel(), format, arguments)
318319
}
319320

320321
override fun error(marker: Marker?, msg: String?, t: Throwable?) {
321-
underlyingLogger.log(io.github.oshai.Level.ERROR.toJULLevel(), msg, t)
322+
underlyingLogger.log(ERROR.toJULLevel(), msg, t)
322323
}
323324

324325
override inline fun entry(vararg argArray: Any?) {
@@ -344,48 +345,48 @@ internal class JulLoggerWrapper(override val underlyingLogger: Logger) : KLogger
344345
}
345346

346347
override val isTraceEnabled: Boolean
347-
get() = underlyingLogger.isLoggable(io.github.oshai.Level.TRACE.toJULLevel())
348+
get() = underlyingLogger.isLoggable(TRACE.toJULLevel())
348349

349350
override fun isTraceEnabled(marker: Marker?): Boolean {
350-
return underlyingLogger.isLoggable(io.github.oshai.Level.TRACE.toJULLevel())
351+
return underlyingLogger.isLoggable(TRACE.toJULLevel())
351352
}
352353

353354
override val isDebugEnabled: Boolean
354-
get() = underlyingLogger.isLoggable(io.github.oshai.Level.DEBUG.toJULLevel())
355+
get() = underlyingLogger.isLoggable(DEBUG.toJULLevel())
355356

356357
override fun isDebugEnabled(marker: Marker?): Boolean {
357-
return underlyingLogger.isLoggable(io.github.oshai.Level.DEBUG.toJULLevel())
358+
return underlyingLogger.isLoggable(DEBUG.toJULLevel())
358359
}
359360

360361
override val isInfoEnabled: Boolean
361-
get() = underlyingLogger.isLoggable(io.github.oshai.Level.INFO.toJULLevel())
362+
get() = underlyingLogger.isLoggable(INFO.toJULLevel())
362363

363364
override fun isInfoEnabled(marker: Marker?): Boolean {
364-
return underlyingLogger.isLoggable(io.github.oshai.Level.INFO.toJULLevel())
365+
return underlyingLogger.isLoggable(INFO.toJULLevel())
365366
}
366367

367368
override val isWarnEnabled: Boolean
368-
get() = underlyingLogger.isLoggable(io.github.oshai.Level.WARN.toJULLevel())
369+
get() = underlyingLogger.isLoggable(WARN.toJULLevel())
369370

370371
override fun isWarnEnabled(marker: Marker?): Boolean {
371-
return underlyingLogger.isLoggable(io.github.oshai.Level.WARN.toJULLevel())
372+
return underlyingLogger.isLoggable(WARN.toJULLevel())
372373
}
373374

374375
override val isErrorEnabled: Boolean
375-
get() = underlyingLogger.isLoggable(io.github.oshai.Level.ERROR.toJULLevel())
376+
get() = underlyingLogger.isLoggable(ERROR.toJULLevel())
376377

377378
override fun isErrorEnabled(marker: Marker?): Boolean {
378-
return underlyingLogger.isLoggable(io.github.oshai.Level.ERROR.toJULLevel())
379+
return underlyingLogger.isLoggable(ERROR.toJULLevel())
379380
}
380381

381382
private fun io.github.oshai.Level.toJULLevel(): Level {
382383
val julLevel: Level =
383384
when (this) {
384-
io.github.oshai.Level.TRACE -> Level.FINEST
385-
io.github.oshai.Level.DEBUG -> Level.FINE
386-
io.github.oshai.Level.INFO -> Level.INFO
387-
io.github.oshai.Level.WARN -> Level.WARNING
388-
io.github.oshai.Level.ERROR -> Level.SEVERE
385+
TRACE -> Level.FINEST
386+
DEBUG -> Level.FINE
387+
INFO -> Level.INFO
388+
WARN -> Level.WARNING
389+
ERROR -> Level.SEVERE
389390
}
390391
return julLevel
391392
}

0 commit comments

Comments
 (0)