Skip to content

Commit 22885c6

Browse files
stotystoty
committed
PHOENIX-6931 Switch queryserver to log4j2
1 parent 4e1ab1f commit 22885c6

File tree

8 files changed

+123
-110
lines changed

8 files changed

+123
-110
lines changed

‎bin/log4j.properties

-76
This file was deleted.

‎bin/log4j2.properties

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#/**
2+
# * Licensed to the Apache Software Foundation (ASF) under one
3+
# * or more contributor license agreements. See the NOTICE file
4+
# * distributed with this work for additional information
5+
# * regarding copyright ownership. The ASF licenses this file
6+
# * to you under the Apache License, Version 2.0 (the
7+
# * "License"); you may not use this file except in compliance
8+
# * with the License. You may obtain a copy of the License at
9+
# *
10+
# * http://www.apache.org/licenses/LICENSE-2.0
11+
# *
12+
# * Unless required by applicable law or agreed to in writing, software
13+
# * distributed under the License is distributed on an "AS IS" BASIS,
14+
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# * See the License for the specific language governing permissions and
16+
# * limitations under the License.
17+
# */
18+
19+
# This config is used by sqlline, pherf and psql
20+
21+
status = warn
22+
dest = err
23+
name = PropertiesConfig
24+
25+
# Console appender
26+
appender.console.type = Console
27+
appender.console.target = SYSTEM_ERR
28+
appender.console.name = console
29+
appender.console.layout.type = PatternLayout
30+
appender.console.layout.pattern = %d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
31+
32+
# Not used by default
33+
# Daily Rolling File Appender
34+
appender.DRFA.type = RollingFile
35+
appender.DRFA.name = DRFA
36+
appender.DRFA.fileName = ${sys:psql.log.dir:-.}/${sys:psql.log.file:-psql.log}
37+
appender.DRFA.filePattern = ${sys:psql.log.dir:-.}/${sys:psql.log.file:-psql.log}.%d{yyyy-MM-dd}
38+
appender.DRFA.createOnDemand = true
39+
appender.DRFA.layout.type = PatternLayout
40+
appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
41+
appender.DRFA.policies.type = Policies
42+
appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
43+
appender.DRFA.policies.time.interval = 1
44+
appender.DRFA.policies.time.modulate = true
45+
appender.DRFA.policies.size.type = SizeBasedTriggeringPolicy
46+
appender.DRFA.policies.size.size = ${sys:psql.log.maxfilesize:-256MB}
47+
appender.DRFA.strategy.type = DefaultRolloverStrategy
48+
appender.DRFA.strategy.max = ${sys:psql.log.maxbackupindex:-20}
49+
50+
# Null Appender
51+
appender.NullAppender.type = Null
52+
appender.NullAppender.name = NullAppender
53+
54+
rootLogger = ${sys:psql.root.logger:-WARN,console}
55+
56+
# Custom Logging levels
57+
logger.zookeeper.name = org.apache.zookeeper
58+
logger.zookeeper.level = ERROR
59+
60+
logger.hbase_zk_rzk.name = org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper
61+
logger.hbase_zk_rzk.level = ERROR
62+
63+
logger.hbase_zk_zku.name = org.apache.hadoop.hbase.zookeeper.ZKUtil
64+
logger.hbase_zk_zku.level = ERROR
65+
66+
logger.hbase_conf.name = org.apache.hadoop.hbase.HBaseConfiguration
67+
logger.hbase_conf.level = ERROR
68+
69+
70+
# query server custom logging levels
71+
logger.calcite_avatica.name = org.apache.calcite.avatica
72+
logger.calcite_avatica.level = INFO
73+
74+
logger.phoenix_queryserver_server.name = org.apache.phoenix.queryserver.server
75+
logger.phoenix_queryserver_server.level = INFO
76+
77+
logger.eclipse_jetty.name = org.eclipse.jetty.server
78+
logger.eclipse_jetty.level = INFO

‎bin/phoenix_queryserver_utils.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ def setPath():
8282
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-queryserver-[!c]*.jar"
8383
PHOENIX_LOADBALANCER_JAR_PATTERN = "load-balancer-*[!t][!e][!s][!t][!s].jar"
8484
SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar"
85-
SLF4J_BACKEND_JAR_PATTERN = "slf4j-reload4j-*[!s].jar"
86-
LOGGING_JAR_PATTERN = "reload4j-*[!s].jar"
85+
SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j*.jar"
86+
LOGGING_JAR_PATTERN = "log4j-core*.jar"
87+
LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
88+
LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar"
8789

8890
OVERRIDE_SLF4J_BACKEND = "PHOENIX_THIN_OVERRIDE_SLF4J_BACKEND"
8991
OVERRIDE_LOGGING = "OVERRIDE_LOGGING_JAR_LOCATION"
@@ -167,6 +169,8 @@ def setPath():
167169
logging_jar = os.environ.get(OVERRIDE_LOGGING)
168170
if logging_jar is None or logging_jar == "":
169171
logging_jar = findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN, os.path.join(current_dir, "..","lib"))
172+
logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN2, os.path.join(current_dir, "..","lib"))
173+
logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN3, os.path.join(current_dir, "..","lib"))
170174

171175
return ""
172176

‎bin/queryserver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
phoenix_queryserver_utils.phoenix_client_jar + os.pathsep + \
129129
phoenix_queryserver_utils.phoenix_queryserver_jar + \
130130
" -Dproc_phoenixserver" + \
131-
" -Dlog4j.configuration=file:" + os.path.join(phoenix_queryserver_utils.current_dir, "log4j.properties") + \
131+
' -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_queryserver_utils.current_dir, "log4j2.properties") + \
132132
" -Dpsql.root.logger=%(root_logger)s" + \
133133
" -Dpsql.log.dir=%(log_dir)s" + \
134134
" -Dpsql.log.file=%(log_file)s" + \

‎bin/sqlline-thin.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ def get_spnego_auth_disabled():
213213
phoenix_queryserver_utils.phoenix_thin_client_jar + os.pathsep + \
214214
phoenix_queryserver_utils.slf4j_backend_jar + os.pathsep + \
215215
phoenix_queryserver_utils.logging_jar +\
216-
'" -Dlog4j.configuration=file:' + \
217-
os.path.join(phoenix_queryserver_utils.current_dir, "log4j.properties") + \
216+
'" -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_queryserver_utils.current_dir, "log4j2.properties") + \
218217
' -Djavax.security.auth.useSubjectCredsOnly=false ' + \
219218
disable_jna + \
220219
" org.apache.phoenix.queryserver.client.SqllineWrapper -d org.apache.phoenix.queryserver.client.Driver " + \

‎phoenix-queryserver-assembly/pom.xml

+12-4
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,20 @@
4747
<classifier>jar-with-dependencies</classifier>
4848
</dependency>
4949
<dependency>
50-
<groupId>org.slf4j</groupId>
51-
<artifactId>slf4j-reload4j</artifactId>
50+
<groupId>org.apache.logging.log4j</groupId>
51+
<artifactId>log4j-slf4j-impl</artifactId>
5252
</dependency>
5353
<dependency>
54-
<groupId>ch.qos.reload4j</groupId>
55-
<artifactId>reload4j</artifactId>
54+
<groupId>org.apache.logging.log4j</groupId>
55+
<artifactId>log4j-api</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.apache.logging.log4j</groupId>
59+
<artifactId>log4j-core</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.apache.logging.log4j</groupId>
63+
<artifactId>log4j-1.2-api</artifactId>
5664
</dependency>
5765
</dependencies>
5866

‎phoenix-queryserver-assembly/src/assembly/cluster.xml

+4-14
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<outputDirectory>phoenix-queryserver-${project.parent.version}/lib</outputDirectory>
6060
<includes>
6161
<include>sqlline:sqlline:jar:jar-with-dependencies</include>
62+
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
63+
<include>org.apache.logging.log4j:log4j-api</include>
64+
<include>org.apache.logging.log4j:log4j-core</include>
65+
<include>org.apache.logging.log4j:log4j-1.2-api</include>
6266
</includes>
6367
</dependencySet>
6468
<dependencySet>
@@ -68,19 +72,5 @@
6872
<include>org.apache.phoenix:${phoenix.client.artifactid}:jar</include>
6973
</includes>
7074
</dependencySet>
71-
<dependencySet>
72-
<unpack>false</unpack>
73-
<outputDirectory>phoenix-queryserver-${project.parent.version}/lib</outputDirectory>
74-
<includes>
75-
<include>org.slf4j:slf4j-reload4j</include>
76-
</includes>
77-
</dependencySet>
78-
<dependencySet>
79-
<unpack>false</unpack>
80-
<outputDirectory>phoenix-queryserver-${project.parent.version}/lib</outputDirectory>
81-
<includes>
82-
<include>ch.qos.reload4j:reload4j</include>
83-
</includes>
84-
</dependencySet>
8575
</dependencySets>
8676
</assembly>

‎pom.xml

+21-11
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,10 @@
8585
<commons-collections.version>3.2.2</commons-collections.version>
8686
<sqlline.version>1.9.0</sqlline.version>
8787
<slf4j.version>1.7.36</slf4j.version>
88-
<reload4j.version>1.2.19</reload4j.version>
8988
<avatica.version>1.23.0</avatica.version>
9089
<servlet.api.version>3.1.0</servlet.api.version>
9190
<jsr305.version>3.0.0</jsr305.version>
92-
<log4j2.version>2.19.0</log4j2.version>
91+
<log4j2.version>2.20.0</log4j2.version>
9392

9493
<!-- Test Dependency versions -->
9594
<mockito-all.version>1.8.5</mockito-all.version>
@@ -562,25 +561,36 @@
562561
<artifactId>javax.servlet-api</artifactId>
563562
<version>${servlet.api.version}</version>
564563
</dependency>
564+
<dependency>
565+
<groupId>net.sourceforge.argparse4j</groupId>
566+
<artifactId>argparse4j</artifactId>
567+
<version>0.8.1</version>
568+
</dependency>
565569
<dependency>
566570
<groupId>org.slf4j</groupId>
567571
<artifactId>slf4j-api</artifactId>
568572
<version>${slf4j.version}</version>
569573
</dependency>
574+
<!-- Logging backends -->
570575
<dependency>
571-
<groupId>org.slf4j</groupId>
572-
<artifactId>slf4j-reload4j</artifactId>
573-
<version>${slf4j.version}</version>
576+
<groupId>org.apache.logging.log4j</groupId>
577+
<artifactId>log4j-api</artifactId>
578+
<version>${log4j2.version}</version>
579+
</dependency>
580+
<dependency>
581+
<groupId>org.apache.logging.log4j</groupId>
582+
<artifactId>log4j-core</artifactId>
583+
<version>${log4j2.version}</version>
574584
</dependency>
575585
<dependency>
576-
<groupId>ch.qos.reload4j</groupId>
577-
<artifactId>reload4j</artifactId>
578-
<version>${reload4j.version}</version>
586+
<groupId>org.apache.logging.log4j</groupId>
587+
<artifactId>log4j-slf4j-impl</artifactId>
588+
<version>${log4j2.version}</version>
579589
</dependency>
580590
<dependency>
581-
<groupId>net.sourceforge.argparse4j</groupId>
582-
<artifactId>argparse4j</artifactId>
583-
<version>0.8.1</version>
591+
<groupId>org.apache.logging.log4j</groupId>
592+
<artifactId>log4j-1.2-api</artifactId>
593+
<version>${log4j2.version}</version>
584594
</dependency>
585595

586596
<!-- Phoenix test dependencies -->

0 commit comments

Comments
 (0)