Merge pull request #843 from ExpediaGroup/fix-incorrect-zone-in-logback-config

fix(logback): incorrect zone id format in logback config

Author: kenluluuuluuuuu

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);
         }
     }

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">

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}"/>
 
     <!---->

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">