Merge pull request #1365 from guardian/revert-1352-aa-dry-logger-xml

Revert "DRYing the logger xml."
guardian · Oct 14, 2015 · d9dc961 · d9dc961
2 parents 5bccaa6 + 2a165f2
commit d9dc961
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 34 deletions.
diff --git a/cropper/conf/logger-include.xml b/cropper/conf/logger-include.xml
diff --git a/cropper/conf/logger.xml b/cropper/conf/logger.xml
@@ -2,6 +2,17 @@
 
     <contextName>cropper</contextName>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
 </configuration>
diff --git a/image-loader/conf/logger-include.xml b/image-loader/conf/logger-include.xml
diff --git a/image-loader/conf/logger.xml b/image-loader/conf/logger.xml
@@ -15,6 +15,18 @@
         </encoder>
     </appender>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="ERROR">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="LOGFILE"/>
+    </root>
 
 </configuration>
diff --git a/kahuna/conf/logger-include.xml b/kahuna/conf/logger-include.xml
diff --git a/kahuna/conf/logger.xml b/kahuna/conf/logger.xml
@@ -2,6 +2,17 @@
 
     <contextName>kahuna</contextName>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
 </configuration>
diff --git a/logger-include.xml b/logger-include.xml
diff --git a/media-api/conf/logger-include.xml b/media-api/conf/logger-include.xml
diff --git a/media-api/conf/logger.xml b/media-api/conf/logger.xml
@@ -2,6 +2,17 @@
 
     <contextName>media-api</contextName>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
 </configuration>
diff --git a/metadata-editor/conf/logger-include.xml b/metadata-editor/conf/logger-include.xml
diff --git a/metadata-editor/conf/logger.xml b/metadata-editor/conf/logger.xml
@@ -2,6 +2,17 @@
 
     <contextName>metadata-editor</contextName>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
 </configuration>
diff --git a/thrall/conf/logger-include.xml b/thrall/conf/logger-include.xml
diff --git a/thrall/conf/logger.xml b/thrall/conf/logger.xml
@@ -2,6 +2,17 @@
 
     <contextName>thrall</contextName>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
 </configuration>
diff --git a/usage/conf/logger-include.xml b/usage/conf/logger-include.xml
diff --git a/usage/conf/logger.xml b/usage/conf/logger.xml
@@ -2,6 +2,17 @@
 
     <contextName>usance</contextName>
 
-    <include resource="logger-include.xml" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />
+
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
 </configuration>