From: Marcus G K Williams <marcus.williams@intel.com>
Date: Tue, 21 Nov 2017 22:44:43 +0000 (-0800)
Subject: Fix org.ops4j.pax.logging.cfg logging config
X-Git-Tag: v0.2.1~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=f5ccf9c19fb2ba7ff8ed50aedc4a9bb15d3afa88

Fix org.ops4j.pax.logging.cfg logging config

Update karaf logging config to keep logs
from filling the disk by limiting DG logging
file number and size.

Issue-ID: SDNC-204 SDNC-203
Change-Id: I325357ed2c22018f1298faff0da1bedb40ab16ae
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
---

diff --git a/odlsli/src/main/resources/org.ops4j.pax.logging.cfg b/odlsli/src/main/resources/org.ops4j.pax.logging.cfg
index 7a575e4a..359ce5dd 100644
--- a/odlsli/src/main/resources/org.ops4j.pax.logging.cfg
+++ b/odlsli/src/main/resources/org.ops4j.pax.logging.cfg
@@ -14,7 +14,7 @@ log4j.appender.async.appenders=out
 # File appender
 log4j.appender.out=org.apache.log4j.RollingFileAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} - %X{currentGraph} - %X{nodeId} | %m%n
 log4j.appender.out.file=${karaf.data}/log/karaf.log
 log4j.appender.out.append=true
 log4j.appender.out.maxFileSize=1MB
@@ -23,22 +23,26 @@ log4j.appender.out.maxBackupIndex=10
 # Directed Graph Node Id appender
 log4j.appender.directed-graph-node-id=org.apache.log4j.sift.MDCSiftingAppender
 log4j.appender.directed-graph-node-id.key=nodeId
-log4j.appender.directed-graph-node-id.default=unknown
+log4j.appender.directed-graph-node-id.default=directedGraphNode
 log4j.appender.directed-graph-node-id.appender=org.apache.log4j.FileAppender
 log4j.appender.directed-graph-node-id.appender.layout=org.apache.log4j.PatternLayout
 log4j.appender.directed-graph-node-id.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %X{nodeId} | %m%n
 log4j.appender.directed-graph-node-id.appender.file=${karaf.data}/log/$\\{nodeId\\}.log
 log4j.appender.directed-graph-node-id.appender.append=true
+log4j.appender.directed-graph-node-id.maxFileSize=1MB
+log4j.appender.directed-graph-node-id.maxBackupIndex=5
 
 # Directed Graph Name appender
 log4j.appender.directed-graph=org.apache.log4j.sift.MDCSiftingAppender
 log4j.appender.directed-graph.key=currentGraph
-log4j.appender.directed-graph.default=unknown
+log4j.appender.directed-graph.default=directedGraph
 log4j.appender.directed-graph.appender=org.apache.log4j.FileAppender
 log4j.appender.directed-graph.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.directed-graph.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %X{currentGraph} | %m%n
+log4j.appender.directed-graph.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %X{currentGraph} | %X{nodeId} | %m%n
 log4j.appender.directed-graph.appender.file=${karaf.data}/log/$\\{currentGraph\\}.log
 log4j.appender.directed-graph.appender.append=true
+log4j.appender.directed-graph.maxFileSize=1MB
+log4j.appender.directed-graph.maxBackupIndex=5
 
 # Sift appender
 log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender