From 8e0895249904e08878080f1b94517e0fa4c51cb8 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Fri, 9 Apr 2021 11:48:15 +0800
Subject: [PATCH] HBASE-25716 The configured loggers in log4j2.xml will always
 be created (#3111)

Signed-off-by: Michael Stack <stack@apache.org>
---
 conf/log4j2.xml                                  | 12 ++++++++----
 .../src/main/resources/log4j2.xml                | 16 +++++++++++-----
 .../src/main/resources/log4j2.xml                | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/conf/log4j2.xml b/conf/log4j2.xml
index bec37e6da0e..868e0d14ffa 100644
--- a/conf/log4j2.xml
+++ b/conf/log4j2.xml
@@ -27,7 +27,8 @@
     <!-- Daily Rolling File Appender -->
     <RollingFile name="DRFA"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%d{yyyy-MM-dd}">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%d{yyyy-MM-dd}"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <TimeBasedTriggeringPolicy interval="1" />
@@ -37,7 +38,8 @@
     <!-- Rolling File Appender -->
     <RollingFile name="RFA"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%i">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="256MB" />
@@ -47,7 +49,8 @@
     <!-- Security audit appender -->
     <RollingFile name="RFAS"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}.%i">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="256MB" />
@@ -58,7 +61,8 @@
       Http Access Log RFA, uncomment this if you want an http access.log
     <RollingFile name="AccessRFA"
       fileName="/var/log/hbase/access.log"
-      filePattern="/var/log/hbase/access.log.%i">
+      filePattern="/var/log/hbase/access.log.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="200MB" />
diff --git a/hbase-archetypes/hbase-client-project/src/main/resources/log4j2.xml b/hbase-archetypes/hbase-client-project/src/main/resources/log4j2.xml
index 63dbeba3cc7..868e0d14ffa 100644
--- a/hbase-archetypes/hbase-client-project/src/main/resources/log4j2.xml
+++ b/hbase-archetypes/hbase-client-project/src/main/resources/log4j2.xml
@@ -27,7 +27,8 @@
     <!-- Daily Rolling File Appender -->
     <RollingFile name="DRFA"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%d{yyyy-MM-dd}">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%d{yyyy-MM-dd}"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <TimeBasedTriggeringPolicy interval="1" />
@@ -37,7 +38,8 @@
     <!-- Rolling File Appender -->
     <RollingFile name="RFA"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%i">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="256MB" />
@@ -47,23 +49,27 @@
     <!-- Security audit appender -->
     <RollingFile name="RFAS"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}.%i">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="256MB" />
       </Policies>
       <DefaultRolloverStrategy max="20" />
     </RollingFile>
-    <!-- Http Access Log RFA -->
+    <!--
+      Http Access Log RFA, uncomment this if you want an http access.log
     <RollingFile name="AccessRFA"
       fileName="/var/log/hbase/access.log"
-      filePattern="/var/log/hbase/access.log.%i">
+      filePattern="/var/log/hbase/access.log.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="200MB" />
       </Policies>
       <DefaultRolloverStrategy max="10" />
     </RollingFile>
+    -->
     <Null name="NullAppender" />
   </Appenders>
   <Loggers>
diff --git a/hbase-archetypes/hbase-shaded-client-project/src/main/resources/log4j2.xml b/hbase-archetypes/hbase-shaded-client-project/src/main/resources/log4j2.xml
index 63dbeba3cc7..868e0d14ffa 100644
--- a/hbase-archetypes/hbase-shaded-client-project/src/main/resources/log4j2.xml
+++ b/hbase-archetypes/hbase-shaded-client-project/src/main/resources/log4j2.xml
@@ -27,7 +27,8 @@
     <!-- Daily Rolling File Appender -->
     <RollingFile name="DRFA"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%d{yyyy-MM-dd}">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%d{yyyy-MM-dd}"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <TimeBasedTriggeringPolicy interval="1" />
@@ -37,7 +38,8 @@
     <!-- Rolling File Appender -->
     <RollingFile name="RFA"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%i">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.log.file:-hbase.log}.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="256MB" />
@@ -47,23 +49,27 @@
     <!-- Security audit appender -->
     <RollingFile name="RFAS"
       fileName="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}"
-      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}.%i">
+      filePattern="${sys:hbase.log.dir:-.}/${sys:hbase.security.log.file:-SecurityAuth.audit}.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="256MB" />
       </Policies>
       <DefaultRolloverStrategy max="20" />
     </RollingFile>
-    <!-- Http Access Log RFA -->
+    <!--
+      Http Access Log RFA, uncomment this if you want an http access.log
     <RollingFile name="AccessRFA"
       fileName="/var/log/hbase/access.log"
-      filePattern="/var/log/hbase/access.log.%i">
+      filePattern="/var/log/hbase/access.log.%i"
+      createOnDemand="true">
       <PatternLayout pattern="%m%n" />
       <Policies>
         <SizeBasedTriggeringPolicy size="200MB" />
       </Policies>
       <DefaultRolloverStrategy max="10" />
     </RollingFile>
+    -->
     <Null name="NullAppender" />
   </Appenders>
   <Loggers>