This is an automated email from the ASF dual-hosted git repository.
snlee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 956df63 Fixing log issue for pinot-tools package (#4228)
956df63 is described below
commit 956df6336bfa147ce7e2d9cf8992169ce44a1ced
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Tue May 21 09:24:26 2019 -0700
Fixing log issue for pinot-tools package (#4228)
`pinot-tools/target/pinot-tools-pkg/bin/pinot-admin.sh` was not
working correctly due to log4j2 config file path configuration.
---
pinot-tools/pom.xml | 26 +++++++++++-----------
.../src/main/resources/conf/pinot-admin-log4j2.xml | 3 +--
.../src/main/resources/conf/pinot-tools-log4j2.xml | 6 +----
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 2d161d9..766852c 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -98,7 +98,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-tools-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -110,7 +110,7 @@
<maxMemorySize>4G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-admin-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-admin-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -122,7 +122,7 @@
<maxMemorySize>20G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-tools-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -134,7 +134,7 @@
<maxMemorySize>30G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-tools-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -146,7 +146,7 @@
<maxMemorySize>30G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-tools-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -157,7 +157,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-tools-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -168,7 +168,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-tools-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -179,7 +179,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-controller-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-controller-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -190,7 +190,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-broker-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-broker-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -201,7 +201,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/pinot-server-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-server-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -212,7 +212,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/quickstart-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/quickstart-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -224,7 +224,7 @@
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=6g</extraArgument>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/quickstart-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/quickstart-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
@@ -235,7 +235,7 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
-
<extraArgument>-Dlog4j2.configurationFile=$BASEDIR/conf/quickstart-log4j2.xml</extraArgument>
+
<extraArgument>-Dlog4j2.configurationFile=conf/quickstart-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
</program>
diff --git a/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
b/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
index c254c7b..b630902 100644
--- a/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
@@ -21,8 +21,7 @@
-->
<Configuration>
<Appenders>
- <Console name="console" target="SYSTEM_OUT">
- </Console>
+ <Console name="console" target="SYSTEM_OUT" />
<RandomAccessFile name="controllerLog" fileName="pinotController.log"
immediateFlush="false">
<PatternLayout>
<Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
diff --git a/pinot-tools/src/main/resources/conf/pinot-tools-log4j2.xml
b/pinot-tools/src/main/resources/conf/pinot-tools-log4j2.xml
index 85f5d8b..cda189a 100644
--- a/pinot-tools/src/main/resources/conf/pinot-tools-log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/pinot-tools-log4j2.xml
@@ -21,11 +21,7 @@
-->
<Configuration>
<Appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout>
- <pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</pattern>
- </PatternLayout>
- </Console>
+ <Console name="console" target="SYSTEM_OUT" />
<RandomAccessFile name="controllerLog" fileName="pinotController.log"
immediateFlush="false">
<PatternLayout>
<Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
