From ea19dacbd2a484c7dae7619774599d256e6493d3 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Wed, 26 Feb 2014 17:19:50 -0800
Subject: [PATCH] handle main job log handler like current launch job log
 handler, close on teardown

---
 .../archive/crawler/framework/CrawlJob.java   | 28 ++++++++-----------
 .../org/archive/crawler/framework/Engine.java |  2 --
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/engine/src/main/java/org/archive/crawler/framework/CrawlJob.java b/engine/src/main/java/org/archive/crawler/framework/CrawlJob.java
index e3d97a4a..31a9644f 100644
--- a/engine/src/main/java/org/archive/crawler/framework/CrawlJob.java
+++ b/engine/src/main/java/org/archive/crawler/framework/CrawlJob.java
@@ -132,9 +132,9 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener<Appli
         if(jobLogger == null) {
             jobLogger = Logger.getLogger(getShortName());
             try {
-                Handler h = new FileHandler(getJobLog().getAbsolutePath(),true);
-                h.setFormatter(new JobLogFormatter());
-                jobLogger.addHandler(h);
+                mainJobLogHandler = new FileHandler(getJobLog().getAbsolutePath(),true);
+                mainJobLogHandler.setFormatter(new JobLogFormatter());
+                jobLogger.addHandler(mainJobLogHandler);
             } catch (SecurityException e) {
                 throw new RuntimeException(e);
             } catch (IOException e) {
@@ -145,18 +145,6 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener<Appli
         return jobLogger;
     }
 
-	/**
-	 * Cleanup when jobdir is removed. closes job.log file
-	 */
-	public void cleanup() {
-		Logger jobLogLogger = getJobLogger();
-		Handler[] handlers = jobLogLogger.getHandlers();
-		for(Handler handler: handlers) {
-			jobLogLogger.removeHandler(handler);
-			handler.close();
-		}
-	}
-    
     public DateTime getLastLaunch() {
         return lastLaunch;
     }
@@ -454,6 +442,7 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener<Appli
         }
     }
     
+    protected transient Handler mainJobLogHandler;
     protected transient Handler currentLaunchJobLogHandler;
 
     protected boolean needTeardown = false;
@@ -593,7 +582,14 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener<Appli
                 currentLaunchJobLogHandler = null;
             }
 
-            getJobLogger().log(Level.INFO,"Job instance discarded");
+            getJobLogger().log(Level.INFO, "Job instance discarded");
+            
+            if (mainJobLogHandler != null) {
+                getJobLogger().removeHandler(mainJobLogHandler);
+                mainJobLogHandler.close();
+                mainJobLogHandler = null;
+            }
+            jobLogger = null;
         }
     }
 
diff --git a/engine/src/main/java/org/archive/crawler/framework/Engine.java b/engine/src/main/java/org/archive/crawler/framework/Engine.java
index be2bb47f..00ef5322 100644
--- a/engine/src/main/java/org/archive/crawler/framework/Engine.java
+++ b/engine/src/main/java/org/archive/crawler/framework/Engine.java
@@ -86,8 +86,6 @@ public class Engine {
         for(String jobName: jobConfigs.keySet().toArray(new String[0])) {
             CrawlJob cj = jobConfigs.get(jobName);
             if(!cj.getJobDir().exists()) {
-				CrawlJob job = jobConfigs.get(jobName);
-				job.cleanup();
                 jobConfigs.remove(jobName); 
             }
         }