This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 6952c6c81d PHOENIX-6756 switch to using log4j2.properties instead of
xml
6952c6c81d is described below
commit 6952c6c81d2abd0201b140bbce2f31b4efe604ca
Author: Istvan Toth
AuthorDate: Fri Jul 29 09:24:42 2022 +0200
PHOENIX-6756 switch to using log4j2.properties instead of xml
also fix serveral problems introduced in the original log4j2 patch
change log format to match HBase both for tests and utilities
---
bin/log4j2.properties | 67 ++
bin/log4j2.xml | 61
bin/performance.py | 4 +-
bin/pherf-standalone.py| 4 +-
bin/phoenix_sandbox.py | 4 +-
bin/psql.py| 4 +-
bin/sandbox-log4j.properties | 45 ---
bin/sandbox-log4j2.properties | 65 +
bin/sqlline.py | 2 +-
bin/traceserver.py | 4 +-
phoenix-core/src/it/resources/log4j.properties | 63
.../src/it/resources/log4j2-test.properties| 45 +++
phoenix-core/src/it/resources/log4j2-test.xml | 49
phoenix-core/src/test/resources/log4j.properties | 65 -
.../src/test/resources/log4j2-test.properties | 50
phoenix-core/src/test/resources/log4j2-test.xml| 51
phoenix-pherf/config/log4j2.properties | 67 ++
phoenix-pherf/config/log4j2.xml| 51
18 files changed, 306 insertions(+), 395 deletions(-)
diff --git a/bin/log4j2.properties b/bin/log4j2.properties
new file mode 100644
index 00..5e1875a2d1
--- /dev/null
+++ b/bin/log4j2.properties
@@ -0,0 +1,67 @@
+#/**
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
+# This config is used by sqlline, pherf and psql
+
+status = warn
+dest = err
+name = PropertiesConfig
+
+# Console appender
+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] %c{2}: %.1000m%n
+
+# Not used by default
+# Daily Rolling File Appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:psql.log.dir:-.}/${sys:psql.log.file:-psql.log}
+appender.DRFA.filePattern =
${sys:psql.log.dir:-.}/${sys:psql.log.file:-psql.log}.%d{-MM-dd}
+appender.DRFA.createOnDemand = true
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.policies.size.type = SizeBasedTriggeringPolicy
+appender.DRFA.policies.size.size = ${sys:psql.log.maxfilesize:-256MB}
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = ${sys:psql.log.maxbackupindex:-20}
+
+# Null Appender
+appender.NullAppender.type = Null
+appender.NullAppender.name = NullAppender
+
+rootLogger = ${sys:psql.root.logger:-WARN,console}
+
+# Custom Logging levels
+logger.zookeeper.name = org.apache.zookeeper
+logger.zookeeper.level = ERROR
+
+logger.hbase_zk_rzk.name =
org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper
+logger.hbase_zk_rzk.level = ERROR
+
+logger.hbase_zk_zku.name = org.apache.hadoop.hbase.zookeeper.ZKUtil
+logger.hbase_zk_zku.level = ERROR
+
+logger.hbase_conf.name = org.apache.hadoop.hbase.HBaseConfiguration
+logger.hbase_conf.level = ERROR
diff --git a/bin/log4j2.xml b/bin/log4j2.xml
deleted file mode 100644
index 1d93814838..00
--- a/bin/log4j2.xml
+++ /dev/null
@@ -1,61 +0,0 @
