From 525c7d8dbef106245c4fce29a5b6b31b7160b21c Mon Sep 17 00:00:00 2001
From: Shwetank Dave <shwetank.dave@amdocs.com>
Date: Fri, 24 Aug 2018 13:24:49 -0400
Subject: Updated log messages to be more intuitive

Added support for kafka
Updated logging.clj file to not reject messages which contain an empty substring.
Updating Dockerfile to use the specified GLIBC_VERSION
Adding spotify docker plugin
Moving the Dockerfile to directory root.

Issue-ID: AAI-1542
Change-Id: I4c41486cb6c7698a2c2736d574721f6a5237563e
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
---
 resources/chameleon_logback.xml        | 10 ++++------
 resources/log/ChameleonMsgs.properties | 10 +++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'resources')

diff --git a/resources/chameleon_logback.xml b/resources/chameleon_logback.xml
index 5b723d7..b413012 100644
--- a/resources/chameleon_logback.xml
+++ b/resources/chameleon_logback.xml
@@ -1,5 +1,4 @@
 <configuration scan="true" scanPeriod="3 seconds" debug="false">
-  <!--<jmxConfigurator /> -->
   <!-- directory path for all other type logs -->
 
   <property name="logDir" value="/opt/chameleon/logs" />
@@ -13,7 +12,7 @@
   <property name="auditLogName" value="audit" />
   <property name="debugLogName" value="debug" />
 
-  <property name="errorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|DataRouter|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
+  <property name="errorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|CHAMELEON|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
 
   <property name="auditMetricPattern" value="%msg%n" />
 
@@ -23,8 +22,7 @@
   <!-- EELF Appenders -->
   <!-- ============================================================================ -->
 
-  <!-- The EELFAppender is used to record events to the general application
-  log -->
+  <!-- The EELFAppender is used to record events to the general application log -->
 
   <appender name="EELF"
             class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -55,7 +53,7 @@
        related logging events. The audit logger and appender are specializations
        of the EELF application root logger and appender. This can be used to segregate
        Policy engine events from other components, or it can be eliminated to record
-  these events as part of the application root log. -->
+       these events as part of the application root log. -->
 
   <appender name="EELFAudit"
             class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -80,7 +78,7 @@
   <!--  EELF loggers -->
   <!-- ============================================================================ -->
 
-  <!-- CRUD Service loggers -->
+  <!-- CHAMELEON Service loggers -->
   <logger name="chameleon" level="INFO">
     <appender-ref ref="asyncEELF" />
   </logger>
diff --git a/resources/log/ChameleonMsgs.properties b/resources/log/ChameleonMsgs.properties
index 4e61e2a..91995ea 100644
--- a/resources/log/ChameleonMsgs.properties
+++ b/resources/log/ChameleonMsgs.properties
@@ -8,12 +8,16 @@ Attempt Gallifrey Assertion of operation {0} with type {1} and key {2} \
 
 GALLIFREY_ASSERTED=\
 CHM0002I|\
-Asserted type {0} and key {1} in Gallifrey\
+Gallifrey Assertion "{0}" for type "{1}" and key "{2}"\
 
 RESPONSE=\
 CHM0003I|\
-Response for operation "{0}" for endpoint "{1}" resulted in status "{2}" with body "{3}"\
+Response for operation "{0}" for endpoint "{1}" resulted in status {2} ; {3}\
 
 CHAMELEON_REQUEST=\
 CHM0004I|\
-Incoming Request of type "{0}" for endpoint "{1}" from address "{2}"\
\ No newline at end of file
+Incoming Request of type {0} for endpoint {1} from address {2}\
+
+ERROR=\
+CHM0001E|\
+ERROR ENCOUNTERED Caused By: "{0}" with message: {1}\
\ No newline at end of file
-- 
cgit 1.2.3-korg