From 217d59240d9256cd3dd218ef5cba49d2cdc2939e Mon Sep 17 00:00:00 2001 From: Geoff Macartney Date: Tue, 23 Jan 2018 14:12:38 +0000 Subject: [PATCH 1/3] Add MDC to pax logging config --- .../src/main/resources/etc/org.ops4j.pax.logging.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg index 517593a3f7..1002db6519 100644 --- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg +++ b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg @@ -18,7 +18,7 @@ ################################################################################ # Common pattern layout for appenders -log4j2.pattern = %d{ISO8601} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n +log4j2.pattern = %d{ISO8601} %X{entity.ids} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n ############### # Root logger # From 06d2ae3ee23d2a6500f1c20dcc85e0bcbb937c2c Mon Sep 17 00:00:00 2001 From: Geoff Macartney Date: Fri, 2 Feb 2018 17:53:36 +0000 Subject: [PATCH 2/3] Add Task ID to MDC --- .../src/main/resources/etc/org.ops4j.pax.logging.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg index 1002db6519..cc78a8431d 100644 --- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg +++ b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg @@ -18,7 +18,7 @@ ################################################################################ # Common pattern layout for appenders -log4j2.pattern = %d{ISO8601} %X{entity.ids} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n +log4j2.pattern = %d{ISO8601} %X{task.id}@%X{entity.ids} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n ############### # Root logger # From 11f446e1046ba7c2548af54418752b19f7733691 Mon Sep 17 00:00:00 2001 From: Geoff Macartney Date: Mon, 5 Feb 2018 16:25:49 +0000 Subject: [PATCH 3/3] Make cosmetic tweak to logging output --- .../src/main/resources/etc/org.ops4j.pax.logging.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg index cc78a8431d..0e410fb5ec 100644 --- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg +++ b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg @@ -18,7 +18,7 @@ ################################################################################ # Common pattern layout for appenders -log4j2.pattern = %d{ISO8601} %X{task.id}@%X{entity.ids} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n +log4j2.pattern = %d{ISO8601} %X{task.id}-%X{entity.ids} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n ############### # Root logger #