From 5d5c1b6db73b1843ff1837c1eeb365fcb63b9406 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 24 Apr 2023 14:06:19 +0200 Subject: [PATCH] HBASE-27762 Include EventType and ProcedureV2 pid in logging via MDC (addendum) Make use of `%notEmpty` pattern with MDC logging. Will function as expected once we upgrade to Log4J 2.21.0+. --- conf/log4j2.properties | 2 +- hbase-logging/src/test/resources/log4j2.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/log4j2.properties b/conf/log4j2.properties index 90d52a2bea13..31e2cf4660fa 100644 --- a/conf/log4j2.properties +++ b/conf/log4j2.properties @@ -25,7 +25,7 @@ appender.console.type = Console appender.console.target = SYSTEM_ERR appender.console.name = console appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{ISO8601} %-5p [%t (%X)] %c{2}: %.1000m%n +appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %c{2}: %.1000m%n # Daily Rolling File Appender appender.DRFA.type = RollingFile diff --git a/hbase-logging/src/test/resources/log4j2.properties b/hbase-logging/src/test/resources/log4j2.properties index 4f29bb455624..1ad757870417 100644 --- a/hbase-logging/src/test/resources/log4j2.properties +++ b/hbase-logging/src/test/resources/log4j2.properties @@ -26,7 +26,7 @@ appender.console.target = SYSTEM_ERR appender.console.name = Console appender.console.maxSize = 1G appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{ISO8601} %-5p [%t (%X)] %C{2}(%L): %m%n +appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %C{2}(%L): %m%n rootLogger = INFO,Console