lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-27 08:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for [HER-1689] build, launch buttons remain enabled after problem building

Browse Source 
* CrawlJob.java
  renamed isContainerOk() to hasApplicationContext()
  increased granularity of isLaunchable() to offer launch button
* JobResource.java
  more coarse check for hasApplicationContext() to disable build button
This commit is contained in:
szznax
2009-11-13 23:23:52 +00:00
parent b72750691f
commit 24463da8bc
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/main/java/org/archive/crawler/framework/CrawlJob.java
+14 -8
View File
@@ -325,7 +325,7 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener {
return ex.getMessage().replace('\n', ' ');
}
public boolean isContainerOk() {
public boolean hasApplicationContext() {
return ac!=null;
}
@@ -354,7 +354,7 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener {
* Ddid the ApplicationContext self-validate?
* return true if validation passed without errors
*/
public boolean isContainerValidated() {
public boolean hasValidApplicationContext() {
if(ac==null) {
return false;
}
@@ -389,7 +389,7 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener {
}
validateConfiguration();
if(!isContainerValidated()) {
if(!hasValidApplicationContext()) {
getJobLogger().log(Level.SEVERE,"Can't launch problem configuration");
return;
}
@@ -612,15 +612,21 @@ public class CrawlJob implements Comparable<CrawlJob>, ApplicationListener {
}
/**
* Is this launchable? (Has CrawlController and not yet been launched?)
* Is it reasonable to offer a launch button
* @return true if launchable
*/
public boolean isLaunchable() {
CrawlController cc = getCrawlController();
if(cc==null) {
return true;
if (!hasApplicationContext()) {
// ok to try launch if not yet built
return true;
}
return !cc.hasStarted();
if (!hasValidApplicationContext()) {
// never launch if specifically invalid
return false;
}
// launchable if cc not yet instantiated or not yet started
CrawlController cc = getCrawlController();
return cc == null || !cc.hasStarted();
}
public int getAlertCount() {
engine/src/main/java/org/archive/crawler/restlet/JobResource.java
+8 -8
View File
@@ -123,14 +123,14 @@ public class JobResource extends Resource {
pw.println("<div style='white-space:nowrap'><form method='POST'>");
// PREP, LAUNCH
pw.print("<input type='submit' name='action' value='build' ");
pw.print(cj.isContainerValidated()?"disabled='disabled' title='build job'":"");
pw.print(cj.hasApplicationContext()?"disabled='disabled' title='build job'":"");
pw.println("/>");
pw.print("<input type='submit' name='action' value='launch'");
if(cj.isProfile()) {
pw.print("disabled='disabled' title='profiles cannot be launched'");
}
if(!cj.isLaunchable()) {
pw.print("disabled='disabled' title='launched OK'");
pw.print("disabled='disabled' ");
}
pw.println("/>&nbsp;&nbsp;&nbsp;");
@@ -159,7 +159,7 @@ public class JobResource extends Resource {
}
pw.println(" type='submit' name='action' value='terminate'/>");
pw.println("<input type='submit' name='action' value='teardown' ");
pw.print(cj.isContainerOk()?"":"disabled='disabled' title='no instance'");
pw.print(cj.hasApplicationContext()?"":"disabled='disabled' title='no instance'");
pw.println("/><br/>");
pw.println("</form></div>");
@@ -212,7 +212,7 @@ public class JobResource extends Resource {
pw.println("<h2>Job is "+getJobStatusDescription()+"</h2>");
if(cj.isContainerOk()) {
if(cj.hasApplicationContext()) {
pw.println("<b>Totals</b><br/>&nbsp;&nbsp;");
pw.println(cj.uriTotalsReport());
pw.println("<br/>&nbsp;&nbsp;");
@@ -246,7 +246,7 @@ public class JobResource extends Resource {
pw.println("<br/><b>Memory</b><br/>&nbsp;&nbsp;");
pw.println(getEngine().heapReport());
if(cj.isRunning() || (cj.isContainerOk() && !cj.isLaunchable())) {
if(cj.isRunning() || (cj.hasApplicationContext() && !cj.isLaunchable())) {
// show crawl log for running or finished crawls
pw.println("<h3>Crawl Log");
printLinkedFile(
@@ -276,7 +276,7 @@ public class JobResource extends Resource {
}
if(cj.isContainerOk()) {
if(cj.hasApplicationContext()) {
pw.println("<h2>Reports</h2>");
for(Class<Report> reportClass : StatisticsTracker.LIVE_REPORTS) {
String className = reportClass.getSimpleName();
@@ -315,7 +315,7 @@ public class JobResource extends Resource {
pw.println("<h2>Advanced</h2>");
pw.println("<h3><a href='script'>Scripting console</a></h3>");
if(!cj.isContainerOk()) {
if(!cj.hasApplicationContext()) {
pw.println("<i>build the job to browse bean instances</i>");
} else {
pw.println("<h3><a href='beans'>Browse beans</a></h3>");
@@ -332,7 +332,7 @@ public class JobResource extends Resource {
}
public String getJobStatusDescription() {
if(!cj.isContainerOk()) {
if(!cj.hasApplicationContext()) {
return "Unbuilt";
} else if(cj.isRunning()) {
return "Active: "+cj.getCrawlController().getState();