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-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new 6f7d3bd PHOENIX-6994 Do not duplicate options specified in
PHOENIX_QUERYSERVER_OPTS in queryserver.py
6f7d3bd is described below
commit 6f7d3bd1685dcda1362e1a231e4e95baaa93f087
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Oct 11 15:37:01 2023 +0200
PHOENIX-6994 Do not duplicate options specified in PHOENIX_QUERYSERVER_OPTS
in queryserver.py
---
bin/queryserver.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/bin/queryserver.py b/bin/queryserver.py
index ec73f1f..9609157 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -128,10 +128,11 @@ java_cmd = '%(java)s -cp ' +\
phoenix_queryserver_utils.phoenix_client_jar + os.pathsep + \
phoenix_queryserver_utils.phoenix_queryserver_jar + \
" -Dproc_phoenixserver" + \
- ' -Dlog4j2.configurationFile=file:' +
os.path.join(phoenix_queryserver_utils.current_dir, "log4j2.properties") + \
- " -Dpsql.root.logger=%(root_logger)s" + \
- " -Dpsql.log.dir=%(log_dir)s" + \
- " -Dpsql.log.file=%(log_file)s" + \
+ ('' if '-Dlog4j2.configurationFile' in opts else '
-Dlog4j2.configurationFile=file:'
+ + os.path.join(phoenix_queryserver_utils.current_dir,
"log4j2.properties")) + \
+ ('' if '-Dpsql.root.logger' in opts else "
-Dpsql.root.logger=%(root_logger)s") + \
+ ('' if '-Dpsql.log.dir' in opts else " -Dpsql.log.dir=%(log_dir)s") + \
+ ('' if '-Dpsql.log.file' in opts else " -Dpsql.log.file=%(log_file)s") + \
" " + opts + \
" org.apache.phoenix.queryserver.server.QueryServer " + args
