Fix log location

[clamp.git] / src / main / resources / logback.xml

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index e02a320..22206fe 100644 (file)
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <configuration scan="true" scanPeriod="10 seconds" debug="false">
-               <contextName>${module.ajsc.namespace.name}</contextName>
                <jmxConfigurator />
-               <property name="logDirectory" value="log" />
+               <property resource="application.properties" />
+               <property name="logDirectory" value="${clamp.config.log.path}" />
                <!-- Example evaluator filter applied against console appender -->
                <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
                                <!-- filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>ERROR</level> 
@@ -21,7 +21,7 @@
                                <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
                                                <level>INFO</level>
                                </filter>
-                               <file>${logDirectory}/CLAMP/error.log</file>
+                               <file>${logDirectory}/clamp/error.log</file>
                                <append>true</append>
                                <encoder>
                                                <pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX", UTC}|%X{RequestId}|%.20thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDescription}|%msg%n</pattern>
@@ -29,7 +29,7 @@
                                <rollingPolicy
                                                class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
                                                <maxIndex>10</maxIndex>
-                                               <FileNamePattern>${logDirectory}/CLAMP/error.%i.log.zip
+                                               <FileNamePattern>${logDirectory}/clamp/error.%i.log.zip
                                                </FileNamePattern>
                                </rollingPolicy>
                                <triggeringPolicy
@@ -40,13 +40,13 @@
 
                <appender name="DEBUG"
                                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                               <file>${logDirectory}/CLAMP/debug.log</file>
+                               <file>${logDirectory}/clamp/debug.log</file>
                                <append>true</append>
                                <encoder>
                                                <pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX",UTC}|%X{RequestId}|%.20thread|%.-5level|%logger{36}|%msg%n</pattern>
                                </encoder>
                                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                                       <fileNamePattern>${logDirectory}/CLAMP/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+                                       <fileNamePattern>${logDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
                                        <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                                                <maxFileSize>10MB</maxFileSize>
                                        </timeBasedFileNamingAndTriggeringPolicy>
@@ -56,7 +56,7 @@
 
                <appender name="AUDIT"
                                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                               <file>${logDirectory}/CLAMP/audit.log</file>
+                               <file>${logDirectory}/clamp/audit.log</file>
                                <append>true</append>
                                <encoder>
                                                <pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
@@ -65,7 +65,7 @@
                                <rollingPolicy
                                                class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
                                                <maxIndex>10</maxIndex>
-                                               <FileNamePattern>${logDirectory}/CLAMP/audit.%i.log.zip
+                                               <FileNamePattern>${logDirectory}/clamp/audit.%i.log.zip
                                                </FileNamePattern>
                                </rollingPolicy>
                                <triggeringPolicy
@@ -80,7 +80,7 @@
 
                <appender name="METRIC"
                                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                               <file>${logDirectory}/CLAMP/metric.log</file>
+                               <file>${logDirectory}/clamp/metric.log</file>
                                <append>true</append>
                                <encoder>
                                                <pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|
@@ -89,7 +89,7 @@
                                <rollingPolicy
                                                class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
                                                <maxIndex>10</maxIndex>
-                                               <FileNamePattern>${logDirectory}/CLAMP/metric.%i.log.zip
+                                               <FileNamePattern>${logDirectory}/clamp/metric.%i.log.zip
                                                </FileNamePattern>
                                </rollingPolicy>
                                <triggeringPolicy
@@ -105,7 +105,7 @@
                <!-- SECURITY related loggers -->
                <appender name="SECURITY"
                                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                               <file>${logDirectory}/CLAMP/security.log</file>
+                               <file>${logDirectory}/clamp/security.log</file>
                                <append>true</append>
                                <encoder>
                                                <pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
@@ -114,7 +114,7 @@
                                <rollingPolicy
                                                class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
                                                <maxIndex>10</maxIndex>
-                                               <FileNamePattern>${logDirectory}/CLAMP/security.%i.log.zip
+                                               <FileNamePattern>${logDirectory}/clamp/security.%i.log.zip
                                                </FileNamePattern>
                                </rollingPolicy>
                                <triggeringPolicy
@@ -131,6 +131,11 @@
                <logger name="org.onap.clamp.clds" level="INFO" additivity="true">
                                <appender-ref ref="ERROR" />
                </logger>
+               
+               <!-- CLDS related loggers -->
+               <logger name="com.att.eelf.error" level="OFF" additivity="true">
+                               <appender-ref ref="ERROR" />
+               </logger>
                <!-- EELF related loggers -->
                <logger name="com.att.eelf.audit" level="INFO" additivity="false">
                                <appender-ref ref="asyncEELFAudit" />
@@ -149,29 +154,6 @@
                <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="INFO" />
-               <logger name="ajsc.ComputeService" level="INFO" />
-               <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" />
-
-               <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet 
-                               logging) -->
-               <logger name="ajsc.utils" level="WARN" />
-               <logger name="ajsc.utils.DME2Helper" level="INFO" />
-               <logger name="ajsc.filters" level="DEBUG" />
-               <logger name="ajsc.beans.interceptors" level="DEBUG" />
-               <logger name="ajsc.restlet" level="DEBUG" />
-               <logger name="ajsc.servlet" level="DEBUG" />
-               <logger name="com.att" level="WARN" />
-               <logger name="com.att.ajsc.csi.logging" level="DEBUG" />
-               <logger name="com.att.ajsc.filemonitor" level="WARN" />
-               <logger name="com.att.ajsc.introscope" level="info" />
-
                <!-- Other Loggers that may help troubleshoot -->
                <logger name="net.sf" level="WARN" />
                <logger name="org.apache.commons.httpclient" level="WARN" />