From 92c238b2aaec600c837edb9a730e2ed9b0d85fcc Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Mon, 26 Jun 2017 13:24:24 +0100
Subject: [PATCH] Alter logging patterns to a more explicit form. (#918)

---
 config/dev/log4j2.xml                                     | 6 +++---
 config/test/log4j2.xml                                    | 2 +-
 samples/simm-valuation-demo/src/main/resources/log4j2.xml | 8 ++++----
 tools/demobench/src/main/resources/log4j2.xml             | 4 ++--
 tools/demobench/src/test/resources/log4j2-test.xml        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml
index f85a22fbee..fa6ff74c5b 100644
--- a/config/dev/log4j2.xml
+++ b/config/dev/log4j2.xml
@@ -13,7 +13,7 @@
 
     <Appenders>
         <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%level{length=1} %d{HH:mm:ss} [%t] %c{2}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red}" />
+            <PatternLayout pattern="%highlight{%level{length=1} %date{HH:mm:ss} [%t] %c{2}.%method - %msg%n}{INFO=white,WARN=red,FATAL=bright red}" />
         </Console>
 
         <!-- Required for printBasicInfo -->
@@ -25,9 +25,9 @@
              those that are older than 60 days, but keep the most recent 10 GB -->
         <RollingFile name="RollingFile-Appender"
                      fileName="${sys:log-path}/${log-name}.log"
-                     filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
+                     filePattern="${archive}/${log-name}.%date{yyyy-MM-dd}-%i.log.gz">
 
-            <PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{2}.%M - %msg%n"/>
+            <PatternLayout pattern="[%-5level] %date{ISO8601}{GMT+0} [%t] %c{2}.%method - %msg%n"/>
 
             <Policies>
                 <TimeBasedTriggeringPolicy/>
diff --git a/config/test/log4j2.xml b/config/test/log4j2.xml
index eca12924ef..adcab4aeb5 100644
--- a/config/test/log4j2.xml
+++ b/config/test/log4j2.xml
@@ -5,7 +5,7 @@
     </Properties>
     <Appenders>
         <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%-5level] %d{HH:mm:ss.SSS} [%t] %c{2}.%M - %msg%n" />
+            <PatternLayout pattern="[%-5level] %date{HH:mm:ss.SSS} [%t] %c{2}.%method - %msg%n" />
         </Console>
         <!-- Required for printBasicInfo -->
         <Console name="Console-Appender-Println" target="SYSTEM_OUT">
diff --git a/samples/simm-valuation-demo/src/main/resources/log4j2.xml b/samples/simm-valuation-demo/src/main/resources/log4j2.xml
index b929e776d9..0205e4fbfe 100644
--- a/samples/simm-valuation-demo/src/main/resources/log4j2.xml
+++ b/samples/simm-valuation-demo/src/main/resources/log4j2.xml
@@ -13,7 +13,7 @@
         <Console name="Console-Appender" target="SYSTEM_OUT">
             <PatternLayout>
                 <pattern>
-                    [%-5level] %d{HH:mm:ss.SSS} [%t] %c{2}.%M - %msg%n
+                    [%-5level] %date{HH:mm:ss.SSS} [%t] %c{2}.%method - %msg%n
                 </pattern>>
             </PatternLayout>
         </Console>
@@ -27,9 +27,9 @@
              those that are older than 60 days, but keep the most recent 10 GB -->
         <RollingFile name="RollingFile-Appender"
                      fileName="${log-path}/${log-name}.log"
-                     filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
+                     filePattern="${archive}/${log-name}.%date{yyyy-MM-dd}-%i.log.gz">
 
-            <PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{2} - %msg%n"/>
+            <PatternLayout pattern="[%-5level] %date{ISO8601}{GMT+0} [%t] %c{2} - %msg%n"/>
 
             <Policies>
                 <TimeBasedTriggeringPolicy/>
@@ -61,4 +61,4 @@
         </Logger>
     </Loggers>
 
-</Configuration>
\ No newline at end of file
+</Configuration>
diff --git a/tools/demobench/src/main/resources/log4j2.xml b/tools/demobench/src/main/resources/log4j2.xml
index c1a85aa61d..526b1bdb46 100644
--- a/tools/demobench/src/main/resources/log4j2.xml
+++ b/tools/demobench/src/main/resources/log4j2.xml
@@ -16,9 +16,9 @@
              those that are older than 60 days, but keep the most recent 10 GB -->
         <RollingFile name="RollingFile-Appender"
                      fileName="${sys:log-path}/${log-name}.log"
-                     filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
+                     filePattern="${archive}/${log-name}.%date{yyyy-MM-dd}-%i.log.gz">
 
-            <PatternLayout pattern="%d{ISO8601}{GMT+0} [%-5level] %c{1} - %msg%n"/>
+            <PatternLayout pattern="%date{ISO8601}{GMT+0} [%-5level] %c{1} - %msg%n"/>
 
             <Policies>
                 <TimeBasedTriggeringPolicy/>
diff --git a/tools/demobench/src/test/resources/log4j2-test.xml b/tools/demobench/src/test/resources/log4j2-test.xml
index 5850a9619c..b0be744c42 100644
--- a/tools/demobench/src/test/resources/log4j2-test.xml
+++ b/tools/demobench/src/test/resources/log4j2-test.xml
@@ -3,7 +3,7 @@
 
     <Appenders>
         <Console name="Console-Appender" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date %highlight{%level %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red}"/>
+            <PatternLayout pattern="%date %highlight{%level %c{1}.%method - %msg%n}{INFO=white,WARN=red,FATAL=bright red}"/>
         </Console>
     </Appenders>