From d711ffd7bb3c86f5911d335faea5910c9df58398 Mon Sep 17 00:00:00 2001
From: xerus2000 <27jf@pm.me>
Date: Thu, 21 Jan 2021 16:27:14 +0100
Subject: [PATCH] feat: update logback format to include milliseconds & align
 messages

---
 helpers/test-client/src/logback-tests.xml   | 9 ++++-----
 server/configuration/logback-production.xml | 8 +++-----
 server/configuration/logback-release.xml    | 6 +++---
 server/configuration/logback.xml            | 2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/helpers/test-client/src/logback-tests.xml b/helpers/test-client/src/logback-tests.xml
index 7212ed86b..e781750a3 100644
--- a/helpers/test-client/src/logback-tests.xml
+++ b/helpers/test-client/src/logback-tests.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-  <!-- This config should be released with the app as "logback.xml". -->
   <appender name="FILE"
             class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${LOG_DIRECTORY:-log}/game_server.log</file>
+    <file>${LOG_DIRECTORY:-log}/testclient.log</file>
 
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>${LOG_DIRECTORY:-log}/game_server.%i.log.gz</FileNamePattern>
+      <FileNamePattern>${LOG_DIRECTORY:-log}/testclient.%i.log.gz</FileNamePattern>
       <MinIndex>1</MinIndex>
       <MaxIndex>5</MaxIndex>
     </rollingPolicy>
@@ -18,12 +17,12 @@
     </triggeringPolicy>
 
     <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss} %-5level %logger{36} - %msg%n</Pattern>
+      <Pattern>%d{HH:mm:ss.SSS} %-5level %36logger{36} - %msg%n</Pattern>
     </layout>
   </appender>
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <layout>
-      <pattern>%d{HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%.-11d{HH:mm:ss.SSS} %-5level %36logger{36} - %msg%n</pattern>
     </layout>
   </appender>
 
diff --git a/server/configuration/logback-production.xml b/server/configuration/logback-production.xml
index 486240bec..068c9a500 100644
--- a/server/configuration/logback-production.xml
+++ b/server/configuration/logback-production.xml
@@ -2,11 +2,9 @@
 <configuration>
   <!-- This config should be used in production mode, logging only to stdout which is handled by docker. -->
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      <pattern>%d{yy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %36logger{36} - %msg%n</pattern>
+	</layout>
   </appender>
   <root level="INFO">
     <appender-ref ref="STDOUT" />
diff --git a/server/configuration/logback-release.xml b/server/configuration/logback-release.xml
index d76519181..9a0ffdc62 100644
--- a/server/configuration/logback-release.xml
+++ b/server/configuration/logback-release.xml
@@ -18,12 +18,12 @@
     </triggeringPolicy>
 
     <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss} %-5level %logger{36} - %msg%n</Pattern>
+      <Pattern>%d{HH:mm:ss.SSS} %-5level %36logger{36} - %msg%n</Pattern>
     </layout>
   </appender>
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout>
-      <pattern>%d{HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      <pattern>%.-11d{HH:mm:ss.SSS} %-5level %36logger{36} - %msg%n</pattern>
     </layout>
   </appender>
 
diff --git a/server/configuration/logback.xml b/server/configuration/logback.xml
index 6a4ea216f..f5546db7e 100644
--- a/server/configuration/logback.xml
+++ b/server/configuration/logback.xml
@@ -4,7 +4,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{HH:mm:ss} %-5level %logger{36} - %msg%n</Pattern>
+            <Pattern>%d{HH:mm:ss.SSS} %-5level %36logger{36} - %msg%n</Pattern>
         </layout>
     </appender>