Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check JUL log entry params on null. #1990

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Check JUL log entry params on null. #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba33441
Check JUL log entry params on null.
Caparow Aug 8, 2023
e3f7a68
use options
Caparow Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...tage/logstage-core/.jvm/src/main/scala/izumi/logstage/adapter/jul/LogstageJulLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@ class LogstageJulLogger(router: LogRouter) extends java.util.logging.Handler wit

@inline private[this] def mkEntry(record: LogRecord): Log.Entry = {

val id = Log.LoggerId(record.getLoggerName)
val loggerName = Option(record.getLoggerName).getOrElse("unknown")
val id = Log.LoggerId(loggerName)

val thread = Thread.currentThread()

val ctx = Log.StaticExtendedContext(id, SourceFilePosition.unknown)
val threadData = Log.ThreadData(thread.getName, thread.getId)

val allParams = if (record.getThrown == null) {
record.getParameters.toSeq
} else {
record.getParameters.toSeq ++ Seq(record.getThrown)
}
val params = Option(record.getParameters).toSeq.flatten
val allParams = params ++ Option(record.getThrown).toSeq

val messageArgs = allParams.zipWithIndex.map {
kv =>
Log.LogArg(Seq(s"_${kv._2}"), kv._1, hiddenName = true, None)
}

val template = record.getMessage.split("\\{\\d+\\}", -1).map(_.replace("\\", "\\\\"))
val template = Option(record.getMessage)
.map(_.split("\\{\\d+\\}", -1).map(_.replace("\\", "\\\\")))
.getOrElse(Array.empty[String])

val level = toLevel(record)
Log.Entry(
Expand Down
2 changes: 2 additions & 0 deletions logstage/logstage-core/.jvm/src/test/scala/izumi/logstage/sink/JULTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class JULTest extends AnyWordSpec {
val julogger = Logger.getLogger(getClass.getName)
val arr: Array[AnyRef] = Array("param1", "param2", new RuntimeException("param2"))
julogger.log(Level.INFO, "message: {0} {1} {2}", arr)
julogger.log(Level.INFO, "message", null.asInstanceOf[Array[AnyRef]])
julogger.log(Level.INFO, "message")
}
}

Expand Down