log4j2.xml: insert js7.serverId into file header

js7-agent-client/src/main/scala/js7/agent/client/main/AgentClientMain.scala

@@ -21,7 +21,7 @@ import scala.jdk.CollectionConverters.*
  */
 object AgentClientMain extends SimpleServiceProgram[AgentClientMain.Conf]:
 
-  override protected def productName = "JS7 AgentClient"
+  override protected val productName = "AgentClient"
 
   protected def program(conf: Conf): IO[ExitCode] =
     program(conf, println)(using runtime)

js7-agent/src/main/scala/js7/agent/main/AgentMain.scala

@@ -8,7 +8,7 @@ import js7.common.system.startup.ServiceApp
 object AgentMain extends ServiceApp:
   // No Logger here!
 
-  override protected def productName = "JS7 Agent"
+  override protected val productName = "Agent"
 
   def run(args: List[String]): IO[ExitCode] =
     runService(args, AgentConfiguration.fromCommandLine(_), useLockFile = true):

js7-base/jvm/src/main/resources/js7/log4j2.xml

@@ -40,7 +40,7 @@ java ... -Dlog4j2.configurationFile=classpath:js7/log4j2.xml,$config/log4j2.xml
       %highlight{${debugLine}}{ERROR=red bold,WARN=red,INFO=default,DEBUG=green,TRACE=bright_black}%n
     </property>
     <property name="fileHeader">
-      %d{yyyy-MM-dd HH:mm:ss.SSSXX} Begin %X{js7.name} · %X{js7.prettyVersion} · %X{js7.system}%n
+      %d{yyyy-MM-dd HH:mm:ss.SSSXX} Begin JS7 %X{js7.serverId} · %X{js7.prettyVersion} · %X{js7.system}%n
     </property>
     <property name="fileFooter">
       %d{yyyy-MM-dd HH:mm:ss.SSSXX} End of logging%n

js7-base/jvm/src/main/scala/js7/base/log/Log4jThreadContextMap.scala

@@ -57,10 +57,7 @@ extends ThreadContextMap, ReadOnlyThreadContextMap, CopyOnWrite:
     val last = lastLog4jStringMap
     val correlId = CorrelId.local()
     val v = keyToValueVersion
-    if last != null
-      && last.correlId.eq(correlId)
-      && v == lastKeyToValueVersion
-    then
+    if last != null && last.correlId.eq(correlId) && v == lastKeyToValueVersion then
       last
     else
       lastKeyToValueVersion = v
@@ -104,11 +101,11 @@ object Log4jThreadContextMap:
       case _ => false
 
   def initialize(name: String): Unit =
-    keyToValue.put("js7.name", name)
+    keyToValue.put("js7.serverId", name) // May be overwritten later by a more specific value
     System.setProperty("log4j2.threadContextMap", myClassName)
     debug(s"log4j2.threadContextMap=$myClassName")
 
-  private[log] def set(key: String, value: String) =
+  private[log] def set(key: String, value: String): Unit =
     keyToValue.put(key, value)
     keyToValueVersion += 1
 
@@ -130,4 +127,4 @@ object Log4jThreadContextMap:
     Logger[this.type].trace(statistics)
 
   private def debug(string: => String): Unit =
-    if isDebug then println(myClassName + " - " + string)
+    if isDebug then println(s"$myClassName - $string")

js7-base/jvm/src/main/scala/js7/base/log/Logger.scala

@@ -50,10 +50,6 @@ object Logger extends AdHocLogger:
         ScalaLogger[this.type].info(StartUp.startUpLine(name))
       Tests.log()
 
-  def initializeOnly(name: String): Unit =
-    ifNotInitialized:
-      Log4j.initialize(name)
-
   /** Don't initialize but mark as initialized.
    * Use this when logging has been initialized by some outer software (like JOC). */
   def dontInitialize(): Unit =

js7-base/shared/src/test/scala/js7/base/test/TestLogging.scala

@@ -3,4 +3,4 @@ package js7.base.test
 import js7.base.log.Logger
 
 trait TestLogging:
-  Logger.initialize("JS7 Tests")
+  Logger.initialize("Test")

js7-cluster-watch/src/main/scala/js7/cluster/watch/ClusterWatchMain.scala

@@ -9,7 +9,7 @@ import org.jetbrains.annotations.TestOnly
 object ClusterWatchMain extends ServiceApp:
   // No Logger here!
 
-  override protected def productName = "JS7 ClusterWatch"
+  override protected val productName = "ClusterWatch"
 
   def run(args: List[String]): IO[ExitCode] =
     runService(args, ClusterWatchConf.fromCommandLine):

js7-common/src/main/scala/js7/common/system/startup/ServiceMain.scala

@@ -40,7 +40,7 @@ object ServiceMain:
   : IO[ExitCode] =
     IO
       .defer:
-        printlnWithClock(s"$name ${BuildInfo.longVersion}")
+        printlnWithClock(s"JS7 $name ${BuildInfo.longVersion}")
         StartUp.initializeMain()
 
         JavaMainLockfileSupport

js7-controller/src/main/scala/js7/controller/ControllerMain.scala

@@ -8,7 +8,7 @@ import js7.controller.configuration.ControllerConfiguration
 object ControllerMain extends ServiceApp:
 
   // No Logger here!
-  override protected def productName = "JS7 Controller"
+  override protected val productName = "Controller"
 
   def run(args: List[String]): IO[ExitCode] =
     given IORuntime = runtime

project/log4j2.xml

@@ -19,7 +19,7 @@
       <!-- append=true is required to let forked tests append. -->
       <patternLayout
         pattern="%highlight{%d{yyyy-MM-dd HH:mm:ss.nnnnnn} %-5level{INFO=info, DEBUG=debug, TRACE=trace} %notEmpty{%X{js7.correlId} }[%threadName] %logger - %message}{ERROR=red bold,WARN=red,INFO=default,DEBUG=blue,TRACE=bright_black}%n"
-        header="%d{yyyy-MM-dd HH:mm:ss.nnnnnn} Begin %X{js7.name} · %X{js7.prettyVersion} · %X{js7.system}%n"
+        header="%d{yyyy-MM-dd HH:mm:ss.nnnnnn} Begin JS7 %X{js7.serverId} · %X{js7.prettyVersion} · %X{js7.system}%n"
         footer="%d{yyyy-MM-dd HH:mm:ss.nnnnnn} End of logging%n"
         charset="UTF-8"/>
       <policies>