Add an origin ID from the MDC into Karaf logs

see https://git.opendaylight.org/gerrit/#/q/topic:mdc related changes

and read https://logback.qos.ch/manual/mdc.html
or https://logging.apache.org/log4j/2.x/manual/thread-context.html

This change will show the OID in all logs, for example like this:

2017-07-27 23:14:16,034 | WARN  | 0000000000000 | ion(1)-127.0.0.1 |
InfrautilsIT                     | 93 -
PAXEXAM-PROBE-41ce6a29-abaf-44c0-8044-71d3e2bf99da - 0.0.0 | Ho, ho - do
you also see this funky Origin ID at the <== start of this log message:
0000000000000

If there is no originID available, then the new column will just be 13
empty spaces (for correct padding, like all other columns in the log),
like this:

2017-07-27 23:14:16,554 | ERROR |               | 0e6-c784b3cb4f5b |
core                             | 6 - org.apache.karaf.features.core -
4.0.9 | FrameworkEvent ERROR - org.apache.karaf.features.core

Change-Id: If18e1d35d71da5bd5c0fee5f2212915cccb0992e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg
index 80c1df9274bad789fd5fb19812a21605c60e6941..1e0e1a5d8fea94a646aab26a4c7f60dc448ebbd8 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -21,10 +21,12 @@
 log4j.rootLogger=INFO, async, osgi:*
 log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
 
+# NB the %X{originID} is coming from org.opendaylight.infrautils.utils.mdc.Origins
+
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %13X{originID} | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 
 # Async appender forwarding to file appender
 log4j.appender.async=org.apache.log4j.AsyncAppender
@@ -33,7 +35,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 | %13X{originID} | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 log4j.appender.out.file=${karaf.data}/log/karaf.log
 log4j.appender.out.append=true
 log4j.appender.out.maxFileSize=1MB
@@ -45,7 +47,7 @@ log4j.appender.sift.key=bundle.name
 log4j.appender.sift.default=karaf
 log4j.appender.sift.appender=org.apache.log4j.FileAppender
 log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %13X{originID} | %-16.16t | %-32.32c{1} | %m%n
 log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
 log4j.appender.sift.appender.append=true
 
@@ -57,7 +59,7 @@ log4j.appender.sift.appender.append=true
 # If no port is specified, the default, 514, is assumed.
 log4j.appender.syslog=org.apache.log4j.net.SyslogAppender
 log4j.appender.syslog.layout=org.apache.log4j.PatternLayout
-log4j.appender.syslog.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.syslog.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %13X{originID} | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 log4j.appender.syslog.syslogHost=127.0.0.1
 log4J.appender.syslog.facility=KARAF
 log4j.appender.syslog.facilityPrinting=false