From 24486622b83eaee4f6ab0657b1649bc6f54e3e02 Mon Sep 17 00:00:00 2001
From: Zen Yui <zen.yui@namely.com>
Date: Sun, 6 Dec 2020 17:20:33 -0500
Subject: [PATCH] simplify logger configuration names and document (#147)

---
 code/service/src/main/resources/logback.xml | 11 ++++++-----
 docs/configuration.md                       |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/service/src/main/resources/logback.xml b/code/service/src/main/resources/logback.xml
index 85caf4ae..c02c10ab 100644
--- a/code/service/src/main/resources/logback.xml
+++ b/code/service/src/main/resources/logback.xml
@@ -3,8 +3,9 @@
     <!-- Let us define some env vars -->
     <!-- LOG_LEVEL sets the root logging level -->
     <variable name="LOG_LEVEL" value="${LOG_LEVEL:-WARN}"/>
-    <!-- LOG_STYLE accepts {SIMPLE, STDOUT, ASYNCSTDOUT} -->
-    <variable name="LOG_STYLE" value="${LOG_STYLE:-ASYNCJSON}"/>
+
+    <!-- LOG_STYLE accepts {SIMPLE, STANDARD, JSON} -->
+    <variable name="LOG_STYLE" value="${LOG_STYLE:-JSON}"/>
 
     <!-- define appenders -->
     <appender name="SIMPLE" class="ch.qos.logback.core.ConsoleAppender">
@@ -15,15 +16,15 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%date{"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",UTC} %coloredLevel %logger - %msg%n</pattern>
+            <pattern>%date{"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",UTC} %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+    <appender name="STANDARD" class="ch.qos.logback.classic.AsyncAppender">
         <appender-ref ref="STDOUT"/>
     </appender>
 
-    <appender name="ASYNCJSON" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
+    <appender name="JSON" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
         <appender class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="net.logstash.logback.encoder.LogstashEncoder">
                 <timeZone>UTC</timeZone>
diff --git a/docs/configuration.md b/docs/configuration.md
index bff431ea..ae705d31 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -11,6 +11,7 @@ See the following deployment-specific guides for relevant configurations:
 | environment variable | description | default |
 |--- | --- | --- |
 | LOG_LEVEL | The possible values are: _**DEBUG**_, _**INFO**_, _**WARN**_, _**ERROR**_ | DEBUG |
+| LOG_STYLE | Logging format: _**STANDARD**_, _**SIMPLE**_, _**JSON**_ | _**JSON**_ |
 | JAVA_OPTS | The java options for the underlying jvm application | -Xms256M -Xmx1G -XX:+UseG1GC |
 | COS_ADDRESS | container host | 0.0.0.0 |
 | COS_PORT | container port | 9000 |