From 95bf82e2d327dd740fc87e729b3e51fb93a35513 Mon Sep 17 00:00:00 2001 From: gojomo Date: Thu, 29 Apr 2010 23:20:22 +0000 Subject: [PATCH] followup for HER-1688 remember external job directories * Engine.java suppress WARNING for common case of harmless failure during rescans: job already exists * EngineResource.java suppress rescan on each reload (ODD: steve had already committed this change -- I got the commit email -- but now the repo version is missing it. Sourceforge problems?) --- engine/src/main/java/org/archive/crawler/framework/Engine.java | 3 +++ .../main/java/org/archive/crawler/restlet/EngineResource.java | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) 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 6068d1c7..d861e7fa 100644 --- a/engine/src/main/java/org/archive/crawler/framework/Engine.java +++ b/engine/src/main/java/org/archive/crawler/framework/Engine.java @@ -97,6 +97,9 @@ public class Engine { // convert .jobpaths to the referenced external directory jobFile = getJobDirectoryFrom(candidateFile); } + if (jobConfigs.containsKey(jobFile.getName())) { + continue; + } if(!addJobDirectory(jobFile)) { LOGGER.log(Level.WARNING,"invalid job directory: " + jobFile + " where job expected from: " + candidateFile); diff --git a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java index 17422268..5d28bb42 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java @@ -232,8 +232,6 @@ public class EngineResource extends BaseResource { ArrayList jobs = new ArrayList(); - // re-scan job configs on each page load - engine.findJobConfigs(); jobs.addAll(engine.getJobConfigs().values()); pw.println("

Job Directories ("+jobs.size()+")");