Merge pull request #13 from aogonevskiy/master

Fixes for AZK-119 and AZK-120 Both fixes looks good. Thanks for you help.
metamx · Aug 29, 2011 · 6ff5f54 · 6ff5f54
2 parents 72c1e25 + 88450c5
commit 6ff5f54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/azkaban/src/java/azkaban/app/LoggingJob.java b/azkaban/src/java/azkaban/app/LoggingJob.java
@@ -113,8 +113,11 @@ public void run() {
                 throw new RuntimeException(e);
             }
 
-            if(jobAppender != null)
+            if(jobAppender != null) {
                 _logger.removeAppender(jobAppender);
+                jobAppender.close();
+            }
+
         }
     }
 }
diff --git a/bin/azkaban-server.sh b/bin/azkaban-server.sh
@@ -16,6 +16,9 @@
 #  limitations under the License.
 #
 
+PRGDIR=`dirname "$0"`
+AZKABAN_HOME=`cd "$PRGDIR/.." ; pwd`
+
 base_dir=$(dirname $0)/..
 
 for file in $base_dir/lib/*.jar;
@@ -37,4 +40,4 @@ if [ -z $AZKABAN_OPTS ]; then
   AZKABAN_OPTS="-Xmx2G -server -Dcom.sun.management.jmxremote"
 fi
 
-java -Dlog4j.configuration=$base_dir/azkaban/log4j.xml $AZKABAN_OPTS -cp $CLASSPATH azkaban.app.AzkabanApp --static-dir $base_dir/azkaban/web/static $@
+java -Dlog4j.configuration=file://$AZKABAN_HOME/azkaban/log4j.xml $AZKABAN_OPTS -cp $CLASSPATH azkaban.app.AzkabanApp --static-dir $base_dir/azkaban/web/static $@