From fb93b8d2f9ebb5e165b260fea67ee19e4dc876a3 Mon Sep 17 00:00:00 2001
From: Shwetank Dave <shwetank.dave@amdocs.com>
Date: Wed, 4 Apr 2018 13:23:47 -0400
Subject: [PATCH] [AAI-804] Updating dockerfile and start script.

Issue-ID: AAI-804
Change-Id: I45c9beeca2d6e27d8aec787e76e3bb50780bead9
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
---
 bundleconfig-local/etc/logback.xml | 212 +++++++++++++++++++++++++++++++++++++
 src/main/bin/start.sh              |   6 +-
 src/main/docker/Dockerfile         |   3 +
 3 files changed, 220 insertions(+), 1 deletion(-)
 create mode 100644 bundleconfig-local/etc/logback.xml

diff --git a/bundleconfig-local/etc/logback.xml b/bundleconfig-local/etc/logback.xml
new file mode 100644
index 0000000..a108f9c
--- /dev/null
+++ b/bundleconfig-local/etc/logback.xml
@@ -0,0 +1,212 @@
+<configuration scan="true" scanPeriod="3 seconds" debug="false">
+	<!--<jmxConfigurator /> -->
+	<!-- directory path for all other type logs -->
+
+	<property name="logDir"  value="${AJSC_HOME}/logs" />
+
+
+	<!--  specify the component name
+         <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+	<property name="componentName" value="AAI-SDB"></property>
+
+	<!--  default eelf log file names -->
+	<property name="generalLogName" value="error" />
+	<property name="metricsLogName" value="metrics" />
+	<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|SearchDataService|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
+	<property name="auditMetricPattern" value="%m%n" />
+
+	<property name="logDirectory" value="${logDir}/${componentName}" />
+
+	<!-- Example evaluator filter applied against console appender -->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${errorLogPattern}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- ============================================================================ -->
+	<!-- EELF Appenders -->
+	<!-- ============================================================================ -->
+
+	<!-- The EELFAppender is used to record events to the general application
+         log -->
+
+	<appender name="EELF"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${generalLogName}.log</file>
+		<rollingPolicy
+				class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
+			</fileNamePattern>
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${errorLogPattern}</pattern>
+		</encoder>
+	</appender>
+	<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
+		<!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+		<queueSize>256</queueSize>
+		<appender-ref ref="EELF" />
+	</appender>
+
+
+	<!-- EELF Audit Appender. This appender is used to record audit engine
+         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. -->
+
+	<appender name="EELFAudit"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${auditLogName}.log</file>
+		<rollingPolicy
+				class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
+			</fileNamePattern>
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${auditMetricPattern}</pattern>
+		</encoder>
+	</appender>
+	<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="EELFAudit" />
+	</appender>
+
+	<appender name="EELFMetrics"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${metricsLogName}.log</file>
+		<rollingPolicy
+				class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
+			</fileNamePattern>
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
+                 %msg%n"</pattern> -->
+			<pattern>${auditMetricPattern}</pattern>
+		</encoder>
+	</appender>
+
+
+	<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="EELFMetrics"/>
+	</appender>
+
+	<appender name="EELFDebug"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${debugLogName}.log</file>
+		<rollingPolicy
+				class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
+			</fileNamePattern>
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${errorLogPattern}</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="EELFDebug" />
+		<includeCallerData>false</includeCallerData>
+	</appender>
+
+
+	<!-- ============================================================================ -->
+	<!--  EELF loggers -->
+	<!-- ============================================================================ -->
+	<logger name="com.att.eelf" level="info" additivity="false">
+		<appender-ref ref="asyncEELF" />
+		<appender-ref ref="asyncEELFDebug" />
+	</logger>
+
+	<logger name="com.att.eelf.security" level="info" additivity="false">
+		<appender-ref ref="asyncEELFSecurity" />
+	</logger>
+	<logger name="com.att.eelf.perf" level="info" additivity="false">
+		<appender-ref ref="asyncEELFPerformance" />
+	</logger>
+	<logger name="com.att.eelf.server" level="info" additivity="false">
+		<appender-ref ref="asyncEELFServer" />
+	</logger>
+	<logger name="com.att.eelf.policy" level="info" additivity="false">
+		<appender-ref ref="asyncEELFPolicy" />
+	</logger>
+	<logger name="com.att.eelf.audit" level="info" additivity="false">
+		<appender-ref ref="asyncEELFAudit" />
+	</logger>
+	<logger name="com.att.eelf.metrics" level="info" additivity="false">
+		<appender-ref ref="asyncEELFMetrics" />
+	</logger>
+
+	<!-- Spring related loggers -->
+	<logger name="org.springframework" level="WARN" />
+	<logger name="org.springframework.beans" level="WARN" />
+	<logger name="org.springframework.web" level="WARN" />
+	<logger name="com.blog.spring.jms" level="WARN" />
+
+	<!-- AJSC Services (bootstrap services) -->
+	<logger name="ajsc" level="WARN" />
+	<logger name="ajsc.RouteMgmtService" level="WARN" />
+	<logger name="ajsc.ComputeService" level="WARN" />
+	<logger name="ajsc.VandelayService" level="WARN" />
+	<logger name="ajsc.FilePersistenceService" level="WARN" />
+	<logger name="ajsc.UserDefinedJarService" level="WARN" />
+	<logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
+	<logger name="ajsc.LoggingConfigurationService" level="WARN" />
+	<logger name="ajsc.ErrorMessageLookupService" level="WARN" />
+
+	<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
+         logging) -->
+	<logger name="ajsc.utils" level="WARN" />
+	<logger name="ajsc.utils.DME2Helper" level="WARN" />
+	<logger name="ajsc.filters" level="WARN" />
+	<logger name="ajsc.beans.interceptors" level="WARN" />
+	<logger name="ajsc.restlet" level="WARN" />
+	<logger name="ajsc.servlet" level="WARN" />
+	<logger name="com.att" level="INFO" />
+	<logger name="com.att.ajsc.csi.logging" level="WARN" />
+	<logger name="com.att.ajsc.filemonitor" level="WARN" />
+
+	<!-- SearchDB loggers -->
+	<logger name="org.openecomp.sa" level="INFO" />
+
+	<!-- Other Loggers that may help troubleshoot -->
+	<logger name="net.sf" level="WARN" />
+	<logger name="org.apache.commons.httpclient" level="WARN" />
+	<logger name="org.apache.commons" level="WARN" />
+	<logger name="org.apache.coyote" level="WARN" />
+	<logger name="org.apache.jasper" level="WARN" />
+
+	<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
+         May aid in troubleshooting) -->
+	<logger name="org.apache.camel" level="WARN" />
+	<logger name="org.apache.cxf" level="WARN" />
+	<logger name="org.apache.camel.processor.interceptor" level="WARN" />
+	<logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
+	<logger name="org.apache.cxf.service" level="WARN" />
+	<logger name="org.restlet" level="WARN" />
+	<logger name="org.apache.camel.component.restlet" level="WARN" />
+
+	<!-- logback internals logging -->
+	<logger name="ch.qos.logback.classic" level="WARN" />
+	<logger name="ch.qos.logback.core" level="WARN" />
+
+	<root>
+		<appender-ref ref="asyncEELF" />
+		<!-- <appender-ref ref="asyncEELFDebug" /> -->
+	</root>
+
+</configuration>
\ No newline at end of file
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 2f14a98..3d6036f 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 BASEDIR="/opt/app/search-data-service"
+AJSC_HOME="$BASEDIR"
+AJSC_CONF_HOME="$AJSC_HOME/bundleconfig/"
 
 if [ -z "$CONFIG_HOME" ]; then
 	echo "CONFIG_HOME must be set in order to start up process"
@@ -27,7 +29,9 @@ keytool -importkeystore -noprompt -deststorepass $PASS -destkeypass $PASS -srcke
 ## import into cacerts
 sudo keytool -importkeystore -noprompt -deststorepass changeit -destkeypass changeit -destkeystore /$JAVA_HOME/jre/lib/security/cacerts -srckeystore $BASEDIR/config/auth/onap.p12 -srcstoretype PKCS12 -srcstorepass $PASS -alias tomcat
 
-PROPS="$PROPS -Dlogback.configurationFile=$BASEDIR/bundleconfig/etc/logback.xml"
+PROPS="-DAJSC_HOME=$AJSC_HOME"
+PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME"
+PROPS="$PROPS -Dlogging.config=$BASEDIR/bundleconfig/etc/logback.xml"
 PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
 PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD"
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 1fccaf4..ad402b2 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -13,9 +13,12 @@ RUN export JAVA_HOME
 
 # Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
+RUN mkdir -p $MICRO_HOME/bundleconfig/etc
 ADD search-data-service* $MICRO_HOME/
 RUN mkdir -p $BIN_HOME
 COPY *.sh $BIN_HOME
+COPY bundleconfig-local $MICRO_HOME/bundleconfig
+COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc
 RUN chmod 755 $BIN_HOME/*
 RUN ln -s /logs $MICRO_HOME/logs
 
-- 
2.16.6