From 0c8df75ff864e98131f5d32f9d16dcd935a39659 Mon Sep 17 00:00:00 2001
From: Ken Lu <chlu@expediagroup.com>
Date: Wed, 31 Jan 2024 13:13:29 +0000
Subject: [PATCH] fix(logback): incorrect zone id format in logback config

---
 .../styx/infrastructure/logging/LOGBackConfigurer.java       | 5 ++++-
 distribution/conf/env-development/logback.xml                | 2 +-
 distribution/conf/env-perf-local/logback.xml                 | 2 +-
 distribution/conf/logback.xml                                | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/proxy/src/main/java/com/hotels/styx/infrastructure/logging/LOGBackConfigurer.java b/components/proxy/src/main/java/com/hotels/styx/infrastructure/logging/LOGBackConfigurer.java
index b8f57e848b..8fdaa25017 100644
--- a/components/proxy/src/main/java/com/hotels/styx/infrastructure/logging/LOGBackConfigurer.java
+++ b/components/proxy/src/main/java/com/hotels/styx/infrastructure/logging/LOGBackConfigurer.java
@@ -26,7 +26,9 @@
 import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.zone.ZoneRulesException;
 import java.util.logging.Handler;
+import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
@@ -113,7 +115,8 @@ public static void initLogging(URL url, boolean installJULBridge) {
                 SLF4JBridgeHandler.install();
 
             }
-        } catch (JoranException e) {
+        } catch (JoranException | ZoneRulesException e) {
+            Logger.getLogger(LOGBackConfigurer.class.getName()).log(Level.SEVERE, "exception while initializing LOGBack", e);
             throw new IllegalArgumentException("exception while initializing LOGBack", e);
         }
     }
diff --git a/distribution/conf/env-development/logback.xml b/distribution/conf/env-development/logback.xml
index 5c60bd2804..48c882965e 100644
--- a/distribution/conf/env-development/logback.xml
+++ b/distribution/conf/env-development/logback.xml
@@ -10,7 +10,7 @@
 
   <property name="EXCEPTION_MDC_VALUES_SUB_TEMPLATE" value=''/>
   <property name="LAYOUT_PATTERN_BODY" value="%m%n%styx_exception_data"/>
-  <property name="LAYOUT_PATTERN_PREFIX" value="%-5p %d{yyyy-MM-dd HH:mm:ss,SSSZZ} [%c{5}] [build=${release.label}] [%t]"/>
+  <property name="LAYOUT_PATTERN_PREFIX" value="%-5p %d{yyyy-MM-dd HH:mm:ss.SSSZZ} [%c{5}] [build=${release.label}] [%t]"/>
   <property name="LAYOUT_PATTERN" value="${LAYOUT_PATTERN_PREFIX} - ${LAYOUT_PATTERN_BODY}"/>
 
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/distribution/conf/env-perf-local/logback.xml b/distribution/conf/env-perf-local/logback.xml
index da727f6311..c071038abe 100644
--- a/distribution/conf/env-perf-local/logback.xml
+++ b/distribution/conf/env-perf-local/logback.xml
@@ -9,7 +9,7 @@
     <conversionRule conversionWord="styx_exception_data"  converterClass="com.hotels.styx.infrastructure.logging.ExceptionConverter" />
 
     <property name="LAYOUT_PATTERN_BODY" value="%m%n%styx_exception_data"/>
-    <property name="LAYOUT_PATTERN_PREFIX" value="%-5p %d{yyyy-MM-dd HH:mm:ss,SSSZZ} [%c{5}] [build=${release.label}] [%t]"/>
+    <property name="LAYOUT_PATTERN_PREFIX" value="%-5p %d{yyyy-MM-dd HH:mm:ss.SSSZZ} [%c{5}] [build=${release.label}] [%t]"/>
     <property name="LAYOUT_PATTERN" value="${LAYOUT_PATTERN_PREFIX} - ${LAYOUT_PATTERN_BODY}"/>
 
     <!---->
diff --git a/distribution/conf/logback.xml b/distribution/conf/logback.xml
index cdb8038c78..754d9ca543 100644
--- a/distribution/conf/logback.xml
+++ b/distribution/conf/logback.xml
@@ -10,7 +10,7 @@
 
   <property name="EXCEPTION_MDC_VALUES_SUB_TEMPLATE" value=''/>
   <property name="LAYOUT_PATTERN_BODY" value="%m%n%styx_exception_data"/>
-  <property name="LAYOUT_PATTERN_PREFIX" value="%-5p %d{yyyy-MM-dd HH:mm:ss,SSSZZ} [%c{5}] [build=${release.label}] [%t]"/>
+  <property name="LAYOUT_PATTERN_PREFIX" value="%-5p %d{yyyy-MM-dd HH:mm:ss.SSSZZ} [%c{5}] [build=${release.label}] [%t]"/>
   <property name="LAYOUT_PATTERN" value="${LAYOUT_PATTERN_PREFIX} - ${LAYOUT_PATTERN_BODY}"/>
 
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">