azkaban-developers

Enable using log4j.properties file in conf directory (#768) …

10/27/2016 6:37:49 PM

(#769)

* Enable using log4j.properties file in conf directory (#768)

Right now, Azkaban searches for a log4j.properties file baked inside of
a jar file. This change makes the Azkaban startup script search for this
file inside of the conf directory and use it if it exists. If it does
not exist, then we will revert to using the properties file found in the
jar by default.

* Allow customization of conf directory location in startup (#768)

KyleFung

Commit: 62fc290

Tree: 899850b

Parents: 157fa35

Changes

azkaban-exec-server/src/main/bash/azkaban-executor-start.sh 12(+10 -2)

azkaban-solo-server/src/main/bash/azkaban-solo-start.sh 12(+10 -2)

azkaban-web-server/src/main/bash/azkaban-web-start.sh 12(+10 -2)

Details

azkaban-exec-server/src/main/bash/azkaban-executor-start.sh 12(+10 -2)

diff --git a/azkaban-exec-server/src/main/bash/azkaban-executor-start.sh b/azkaban-exec-server/src/main/bash/azkaban-executor-start.sh
index 446571b..54ccdb2 100755
--- a/azkaban-exec-server/src/main/bash/azkaban-executor-start.sh
+++ b/azkaban-exec-server/src/main/bash/azkaban-executor-start.sh
@@ -2,6 +2,10 @@
 
 azkaban_dir=$(dirname $0)/..
 
+# Specifies location of azkaban.properties, log4j.properties files
+# Change if necessary
+conf=$azkaban_dir/conf
+
 if [[ -z "$tmpdir" ]]; then
 tmpdir=/tmp
 fi
@@ -37,16 +41,20 @@ fi
 echo $azkaban_dir;
 echo $CLASSPATH;
 
-executorport=`cat $azkaban_dir/conf/azkaban.properties | grep executor.port | cut -d = -f 2`
+executorport=`cat $conf/azkaban.properties | grep executor.port | cut -d = -f 2`
 echo "Starting AzkabanExecutorServer on port $executorport ..."
 serverpath=`pwd`
 
 if [ -z $AZKABAN_OPTS ]; then
   AZKABAN_OPTS="-Xmx3G"
 fi
+# Set the log4j configuration file
+if [ -f $conf/log4j.properties ]; then
+  AZKABAN_OPTS="$AZKABAN_OPTS -Dlog4j.configuration=file:$conf/log4j.properties"
+fi
 AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmpdir=$tmpdir -Dexecutorport=$executorport -Dserverpath=$serverpath -Dlog4j.log.dir=$azkaban_dir/logs"
 
-java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.execapp.AzkabanExecutorServer -conf $azkaban_dir/conf $@ &
+java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.execapp.AzkabanExecutorServer -conf $conf $@ &
 
 echo $! > $azkaban_dir/currentpid

azkaban-solo-server/src/main/bash/azkaban-solo-start.sh 12(+10 -2)

diff --git a/azkaban-solo-server/src/main/bash/azkaban-solo-start.sh b/azkaban-solo-server/src/main/bash/azkaban-solo-start.sh
index 7c64a4e..b02390c 100755
--- a/azkaban-solo-server/src/main/bash/azkaban-solo-start.sh
+++ b/azkaban-solo-server/src/main/bash/azkaban-solo-start.sh
@@ -2,6 +2,10 @@
 
 azkaban_dir=$(dirname $0)/..
 
+# Specifies location of azkaban.properties, log4j.properties files
+# Change if necessary
+conf=$azkaban_dir/conf
+
 if [[ -z "$tmpdir" ]]; then
 tmpdir=/tmp
 fi
@@ -37,15 +41,19 @@ fi
 echo $azkaban_dir;
 echo $CLASSPATH;
 
-executorport=`cat $azkaban_dir/conf/azkaban.properties | grep executor.port | cut -d = -f 2`
+executorport=`cat $conf/azkaban.properties | grep executor.port | cut -d = -f 2`
 serverpath=`pwd`
 
 if [ -z $AZKABAN_OPTS ]; then
   AZKABAN_OPTS=-Xmx3G
 fi
+# Set the log4j configuration file
+if [ -f $conf/log4j.properties ]; then
+  AZKABAN_OPTS="$AZKABAN_OPTS -Dlog4j.configuration=file:$conf/log4j.properties"
+fi
 AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmpdir=$tmpdir -Dexecutorport=$executorport -Dserverpath=$serverpath -Dlog4j.log.dir=$azkaban_dir/logs"
 
-java $AZKABAN_OPTS -cp $CLASSPATH azkaban.soloserver.AzkabanSingleServer -conf $azkaban_dir/conf $@ &
+java $AZKABAN_OPTS -cp $CLASSPATH azkaban.soloserver.AzkabanSingleServer -conf $conf $@ &
 
 echo $! > $azkaban_dir/currentpid

azkaban-web-server/src/main/bash/azkaban-web-start.sh 12(+10 -2)

diff --git a/azkaban-web-server/src/main/bash/azkaban-web-start.sh b/azkaban-web-server/src/main/bash/azkaban-web-start.sh
index f0cc3c8..9911365 100755
--- a/azkaban-web-server/src/main/bash/azkaban-web-start.sh
+++ b/azkaban-web-server/src/main/bash/azkaban-web-start.sh
@@ -2,6 +2,10 @@
 
 azkaban_dir=$(dirname $0)/..
 
+# Specifies location of azkaban.properties, log4j.properties files
+# Change if necessary
+conf=$azkaban_dir/conf
+
 if [[ -z "$tmpdir" ]]; then
 tmpdir=/tmp
 fi
@@ -37,15 +41,19 @@ fi
 echo $azkaban_dir;
 echo $CLASSPATH;
 
-executorport=`cat $azkaban_dir/conf/azkaban.properties | grep executor.port | cut -d = -f 2`
+executorport=`cat $conf/azkaban.properties | grep executor.port | cut -d = -f 2`
 serverpath=`pwd`
 
 if [ -z $AZKABAN_OPTS ]; then
   AZKABAN_OPTS="-Xmx4G"
 fi
+# Set the log4j configuration file
+if [ -f $conf/log4j.properties ]; then
+  AZKABAN_OPTS="$AZKABAN_OPTS -Dlog4j.configuration=file:$conf/log4j.properties"
+fi
 AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmpdir=$tmpdir -Dexecutorport=$executorport -Dserverpath=$serverpath -Dlog4j.log.dir=$azkaban_dir/logs"
 
-java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.webapp.AzkabanWebServer -conf $azkaban_dir/conf $@ &
+java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.webapp.AzkabanWebServer -conf $conf $@ &
 
 echo $! > $azkaban_dir/currentpid