From 8846d325631bf79537e6f46acf6ef60d02cdad0c Mon Sep 17 00:00:00 2001
From: Willem Pienaar <6728866+woop@users.noreply.github.com>
Date: Wed, 6 Feb 2019 15:00:12 +0800
Subject: [PATCH] Added LOG_TYPE environmental variable

This disables JSON logging by default, but allows the user to enable it by setting LOG_TYPE=JSON
---
 core/src/main/resources/log4j2.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml
index 2931b9b4be4..65b3c5aa4bb 100644
--- a/core/src/main/resources/log4j2.xml
+++ b/core/src/main/resources/log4j2.xml
@@ -17,19 +17,26 @@
   -->
 
 <Configuration status="WARN">
+    <Properties>
+        <Property name="LOG_PATTERN">
+            %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} : %m%n%ex
+        </Property>
+        <Property name="APPENDER_TYPE">${env:LOG_TYPE:-Console}</Property>
+    </Properties>
     <CustomLevels>
         <CustomLevel name="AUDIT" intLevel="350" />
     </CustomLevels>
-
     <Appenders>
-        <Console name="JSONConsoleAppender" target="SYSTEM_OUT" follow="true">
-            <JsonLayout compact="true" eventEol="true" objectMessageAsJsonObject="true" />
+        <Console name="ConsoleAppender" target="SYSTEM_OUT" follow="true">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+        </Console>
+        <Console name="JSONAppender" target="SYSTEM_OUT" follow="true">
+            <JsonLayout  compact="true" eventEol="true" objectMessageAsJsonObject="true" />
         </Console>
     </Appenders>
-
     <Loggers>
         <Root level="info">
-            <AppenderRef ref="JSONConsoleAppender" />
+            <AppenderRef ref="${APPENDER_TYPE}Appender" />
         </Root>
     </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>