From 1d87bdaf775baae7297521e10a36908893ab6bb1 Mon Sep 17 00:00:00 2001
From: Dave O'Brien <david.obrien@digital.hmrc.gov.uk>
Date: Fri, 7 Dec 2018 17:00:18 +0000
Subject: [PATCH] Add logging config

---
 conf/application-json-logger.xml | 13 +++++++
 conf/application.conf            |  2 --
 conf/logback.xml                 | 60 ++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 conf/application-json-logger.xml
 create mode 100644 conf/logback.xml

diff --git a/conf/application-json-logger.xml b/conf/application-json-logger.xml
new file mode 100644
index 0000000..e40586e
--- /dev/null
+++ b/conf/application-json-logger.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="uk.gov.hmrc.play.logging.JsonEncoder"/>
+    </appender>
+
+    <logger name="uk.gov" level="${logger.uk.gov:-WARN}"/>
+
+    <root level="${logger.application:-WARN}">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/conf/application.conf b/conf/application.conf
index 8e1e7ac..d01d86c 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -19,8 +19,6 @@ include "backend.conf"
 
 appName=vat-service-guide
 appUrl="http://"${appName}".local"
-incapacityBenefitPAYEReference="892/BA500"
-employmentAndSupportAllowancePAYEReference="267/ESA500"
 
 # An ApplicationLoader that uses Guice to bootstrap the application.
 play.application.loader = "uk.gov.hmrc.play.bootstrap.ApplicationLoader"
diff --git a/conf/logback.xml b/conf/logback.xml
new file mode 100644
index 0000000..1c8415d
--- /dev/null
+++ b/conf/logback.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>logs/vat-service-guide.log</file>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[%X{X-Request-ID}] user=[%X{Authorization}] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT_IGNORE_NETTY" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="ACCESS_LOG_FILE" class="ch.qos.logback.core.FileAppender">
+        <file>logs/access.log</file>
+        <encoder>
+            <pattern>%message%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="CONNECTOR_LOG_FILE" class="ch.qos.logback.core.FileAppender">
+        <file>logs/connector.log</file>
+        <encoder>
+            <pattern>%message%n</pattern>
+        </encoder>
+    </appender>
+
+
+    <logger name="accesslog" level="INFO" additivity="false">
+        <appender-ref ref="ACCESS_LOG_FILE" />
+    </logger>
+
+    <logger name="com.ning.http.client.providers.netty" additivity="false">
+        <appender-ref ref="STDOUT_IGNORE_NETTY" />
+    </logger>
+
+    <logger name="com.google.inject" level="INFO"/>
+
+    <logger name="uk.gov" level="${logger.uk.gov:-WARN}"/>
+
+    <logger name="application" level="${logger.application:-INFO}"/>
+
+    <logger name="connector" level="${logger.connector:-WARN}">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <root level="INFO">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>