Skip to content

Commit 0dda95a

Browse files
authored
PHOENIX-7477 Set java.util.logging.config.class in scripts (#2040)
and add org.slf4:jul-to-slf4j to classpath where needed
1 parent 9af06d8 commit 0dda95a

File tree

10 files changed

+38
-4
lines changed

10 files changed

+38
-4
lines changed

bin/performance.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ def createFileWithContent(filename, content):
6565

6666
java_cmd = phoenix_utils.java
6767

68-
execute = ('%s %s $PHOENIX_OPTS -cp "%s%s%s%s%s"-Dlog4j2.configurationFile=file:' +
68+
execute = ('%s %s $PHOENIX_OPTS -cp "%s%s%s%s%s"' +
69+
' -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' +
70+
' -Dlog4j2.configurationFile=file:' +
6971
os.path.join(phoenix_utils.current_dir, "log4j2.properties") +
7072
' org.apache.phoenix.util.PhoenixRuntime -t %s %s ') % \
7173
(java_cmd, phoenix_utils.jvm_module_flags, hbase_config_path, os.pathsep,

bin/pherf-standalone.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
phoenix_utils.logging_jar + os.pathsep + \
3939
phoenix_utils.phoenix_client_embedded_jar + os.pathsep +\
4040
phoenix_utils.phoenix_pherf_jar + \
41-
'" -Dlog4j2.configurationFile=file:' + \
41+
'" -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' +\
42+
' -Dlog4j2.configurationFile=file:' + \
4243
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
4344
" org.apache.phoenix.pherf.Pherf " + args
4445

bin/phoenix_utils.py

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def setPath():
8787
LOGGING_JAR_PATTERN = "log4j-core*.jar"
8888
LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
8989
LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar"
90+
LOGGING_JAR_PATTERN4 = "jul-to-slf4j*.jar"
9091
SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar"
9192

9293

@@ -200,6 +201,7 @@ def setPath():
200201
logging_jar = findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN, os.path.join(current_dir, "..","lib"))
201202
logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN2, os.path.join(current_dir, "..","lib"))
202203
logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN3, os.path.join(current_dir, "..","lib"))
204+
logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN4, os.path.join(current_dir, "..","lib"))
203205

204206
__set_java_home()
205207
__set_jvm_flags()

bin/psql.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
' -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.hadoop_conf + \
3535
os.pathsep + phoenix_utils.slf4j_backend_jar + \
3636
os.pathsep + phoenix_utils.logging_jar + \
37-
os.pathsep + phoenix_utils.phoenix_client_embedded_jar + '" -Dlog4j2.configurationFile=file:' + \
37+
os.pathsep + phoenix_utils.phoenix_client_embedded_jar + \
38+
'" -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' + \
39+
' -Dlog4j2.configurationFile=file:' + \
3840
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
3941
" org.apache.phoenix.util.PhoenixRuntime " + args
4042

bin/sqlline.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def kill_child():
9797
phoenix_utils.slf4j_backend_jar + os.pathsep + \
9898
phoenix_utils.logging_jar + os.pathsep + \
9999
phoenix_utils.phoenix_client_lite_jar + \
100-
'" -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
100+
'" -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' + \
101+
' -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
101102
disable_jna + \
102103
" sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver" + \
103104
(not args.noconnect and " -u " + phoenix_utils.shell_quote([jdbc_url]) or "") + \

phoenix-assembly/src/build/components/all-common-dependencies.xml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<outputDirectory>/lib</outputDirectory>
2525
<includes>
2626
<include>sqlline:sqlline:jar:jar-with-dependencies</include>
27+
<include>org.slf4j:jul-to-slf4j</include>
2728
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
2829
<include>org.apache.logging.log4j:log4j-api</include>
2930
<include>org.apache.logging.log4j:log4j-core</include>

phoenix-core-client/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@
151151
</goals>
152152
<configuration>
153153
<artifactItems>
154+
<artifactItem>
155+
<groupId>org.slf4j</groupId>
156+
<artifactId>jul-to-slf4j</artifactId>
157+
</artifactItem>
154158
<artifactItem>
155159
<groupId>org.apache.logging.log4j</groupId>
156160
<artifactId>log4j-api</artifactId>

phoenix-core/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
<ignoredUnusedDeclaredDependency>
106106
org.apache.logging.log4j:log4j-1.2-api
107107
</ignoredUnusedDeclaredDependency>
108+
<ignoredUnusedDeclaredDependency>
109+
org.slf4j:jul-to-slf4j
110+
</ignoredUnusedDeclaredDependency>
108111
</ignoredUnusedDeclaredDependencies>
109112
<ignoredUsedUndeclaredDependencies>
110113
</ignoredUsedUndeclaredDependencies>
@@ -462,6 +465,11 @@
462465
</dependency>
463466

464467
<!-- logging -->
468+
<dependency>
469+
<groupId>org.slf4j</groupId>
470+
<artifactId>jul-to-slf4j</artifactId>
471+
<scope>test</scope>
472+
</dependency>
465473
<dependency>
466474
<groupId>org.apache.logging.log4j</groupId>
467475
<artifactId>log4j-api</artifactId>

phoenix-pherf/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@
161161
</dependency>
162162

163163
<!-- Test Dependencies -->
164+
<dependency>
165+
<groupId>org.slf4j</groupId>
166+
<artifactId>jul-to-slf4j</artifactId>
167+
<scope>test</scope>
168+
</dependency>
164169
<dependency>
165170
<groupId>org.apache.logging.log4j</groupId>
166171
<artifactId>log4j-api</artifactId>
@@ -311,6 +316,9 @@
311316
<ignoredUnusedDeclaredDependency>
312317
org.apache.logging.log4j:log4j-1.2-api
313318
</ignoredUnusedDeclaredDependency>
319+
<ignoredUnusedDeclaredDependency>
320+
org.slf4j:jul-to-slf4j
321+
</ignoredUnusedDeclaredDependency>
314322
</ignoredUnusedDeclaredDependencies>
315323
<ignoredUsedUndeclaredDependencies>
316324
<ignoredUsedUndeclaredDependency>

pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -1799,6 +1799,11 @@
17991799
<artifactId>slf4j-reload4j</artifactId>
18001800
<version>${slf4j.version}</version>
18011801
</dependency>
1802+
<dependency>
1803+
<groupId>org.slf4j</groupId>
1804+
<artifactId> jul-to-slf4j </artifactId>
1805+
<version>${slf4j.version}</version>
1806+
</dependency>
18021807
<dependency>
18031808
<groupId>org.apache.logging.log4j</groupId>
18041809
<artifactId>log4j-api</artifactId>

0 commit comments

Comments
 (0)