[sre] Rearrange JUL to uses the proper formatting.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · May 11, 2020 · 1303e67 · 1303e67
1 parent a42cd75
commit 1303e67
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/....janusproject.plugin/src/main/sarl/io/sarl/sre/services/logging/jul/JulLoggerCreator.sarl b/....janusproject.plugin/src/main/sarl/io/sarl/sre/services/logging/jul/JulLoggerCreator.sarl
@@ -38,7 +38,8 @@ import javax.inject.Provider
  */
 class JulLoggerCreator {
 
-	public val PLATFORM_LOGGER_NAME_PREFIX = "Janus-SRE"
+	/** Prefix for the logger names. */
+	public static val PLATFORM_LOGGER_NAME_PREFIX = "Janus-SRE-"
 
 	val defaultLevel : Level
 
@@ -118,11 +119,14 @@ class JulLoggerCreator {
 	def createPlatformLogger() : Logger {
 		LogManager::logManager.reset
 		val kernelId = this.configProvider.get.boot.rootContextID
-		val loggerName = PLATFORM_LOGGER_NAME_PREFIX + "-K-" + kernelId
+		val loggerName = PLATFORM_LOGGER_NAME_PREFIX + kernelId
 		val logger = this.loggerProvider.apply(loggerName)
-		val stderr = new JulStandardErrorOutputConsoleHandler(getPlatformFormatter)
+		assert logger !== null
+		val formatter = getPlatformFormatter
+		assert formatter !== null
+		val stderr = new JulStandardErrorOutputConsoleHandler(formatter)
 		stderr.level = Level::ALL
-		val stdout = new JulStandardOutputConsoleHandler(getPlatformFormatter)
+		val stdout = new JulStandardOutputConsoleHandler(formatter)
 		stdout.level = Level::ALL
 		var allHandlers = logger.handlers
 		if (allHandlers !== null) {
@@ -151,7 +155,7 @@ class JulLoggerCreator {
 		} else {
 			name
 		}
-		val logger = this.loggerProvider.apply(PLATFORM_LOGGER_NAME_PREFIX + "-M-" + thename)
+		val logger = this.loggerProvider.apply(thename)
 		if (parent !== null) {
 			logger.parent = parent
 			logger.useParentHandlers = true

diff --git a/...nusproject.plugin/src/main/sarl/io/sarl/sre/services/logging/jul/JulPatternFormatter.sarl b/...nusproject.plugin/src/main/sarl/io/sarl/sre/services/logging/jul/JulPatternFormatter.sarl
@@ -25,6 +25,7 @@ import java.io.StringWriter
 import java.util.Date
 import java.util.logging.Formatter
 import java.util.logging.LogRecord
+import java.util.regex.Pattern
 
 /** JUL formatter based on pattern.
  *
@@ -80,10 +81,13 @@ class JulPatternFormatter extends Formatter {
 		} else {
 			throwable = ""
 		}
+		val logName = record.loggerName.replaceFirst("^" +
+			Pattern::quote(JulLoggerCreator::PLATFORM_LOGGER_NAME_PREFIX),
+			"")
 		return String::format(
 			this.pattern,
 			dat, source,
-			record.loggerName,
+			logName,
 			record.level.localizedName,
 			message,
 			throwable)