From bae3ac071c74f100a4e2c1487b86cf7de1e2b71f Mon Sep 17 00:00:00 2001
From: Kent Yao <yaooqinn@hotmail.com>
Date: Mon, 21 Sep 2020 18:08:54 +0800
Subject: [PATCH] Fix log4j

---
 bin/kyuubi.sh                                              | 2 +-
 conf/log4j.properties                                      | 2 +-
 kyuubi-common/src/main/resources/log4j-defaults.properties | 2 +-
 kyuubi-common/src/test/resources/log4j.properties          | 2 +-
 kyuubi-main/pom.xml                                        | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/kyuubi.sh b/bin/kyuubi.sh
index 46765c553..ebc715818 100755
--- a/bin/kyuubi.sh
+++ b/bin/kyuubi.sh
@@ -106,7 +106,7 @@ function start_kyuubi() {
     log="${KYUUBI_LOG_DIR}/kyuubi-$USER-$CLASS-$HOSTNAME.out"
     kyuubi_rotate_log ${log}
 
-    KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}/*"
+    KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}"
     cmd="${RUNNER} ${KYUUBI_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS"
     echo "Starting $CLASS, logging to $log"
     nohup nice -n "${KYUUBI_NICENESS:-0}" ${cmd} >> ${log} 2>&1 < /dev/null &
diff --git a/conf/log4j.properties b/conf/log4j.properties
index 426adcf6d..2d091a952 100644
--- a/conf/log4j.properties
+++ b/conf/log4j.properties
@@ -20,4 +20,4 @@ log4j.rootCategory=INFO, console
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.target=System.err
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
\ No newline at end of file
+log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p %c{2}: %m%n
diff --git a/kyuubi-common/src/main/resources/log4j-defaults.properties b/kyuubi-common/src/main/resources/log4j-defaults.properties
index 426adcf6d..2d091a952 100644
--- a/kyuubi-common/src/main/resources/log4j-defaults.properties
+++ b/kyuubi-common/src/main/resources/log4j-defaults.properties
@@ -20,4 +20,4 @@ log4j.rootCategory=INFO, console
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.target=System.err
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
\ No newline at end of file
+log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p %c{2}: %m%n
diff --git a/kyuubi-common/src/test/resources/log4j.properties b/kyuubi-common/src/test/resources/log4j.properties
index b94ca7ad9..42fe5d506 100644
--- a/kyuubi-common/src/test/resources/log4j.properties
+++ b/kyuubi-common/src/test/resources/log4j.properties
@@ -33,4 +33,4 @@ log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %t %p %c{2}: %m%n
 
 # Set the logger level of File Appender to WARN
-log4j.appender.FA.Threshold = DEBUG
\ No newline at end of file
+log4j.appender.FA.Threshold = DEBUG
diff --git a/kyuubi-main/pom.xml b/kyuubi-main/pom.xml
index ad74a3507..ee7ba2479 100644
--- a/kyuubi-main/pom.xml
+++ b/kyuubi-main/pom.xml
@@ -48,6 +48,7 @@
             <artifactId>kyuubi-common</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
     </dependencies>