Debug
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-833@1565449 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java b/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
index b6cac26..3294354 100644
--- a/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
+++ b/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
@@ -431,6 +431,19 @@
long currentTime = System.currentTimeMillis();
+ if (e.getClass().getName().equals("java.net.ConnectException"))
+ {
+ // Server isn't up at all. Try for a brief time then give up.
+ String message = "Server could not be contacted during "+context+": "+e.getMessage();
+ Logging.ingest.warn(message,e);
+ throw new ServiceInterruption(message,
+ e,
+ currentTime + interruptionRetryTime,
+ -1L,
+ 3,
+ false);
+ }
+
if (e.getClass().getName().equals("java.net.SocketException"))
{
// In the past we would have treated this as a straight document rejection, and
diff --git a/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java b/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
index e201bec..636bf7e 100644
--- a/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
+++ b/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
@@ -7302,7 +7302,7 @@
StringBuilder sb = new StringBuilder("SELECT ");
ArrayList list = new ArrayList();
- sb.append(jobs.idField).append(",").append(jobs.failTimeField).append(jobs.failCountField)
+ sb.append(jobs.idField).append(",").append(jobs.failTimeField).append(",").append(jobs.failCountField)
.append(" FROM ").append(jobs.getTableName()).append(" WHERE ")
.append(database.buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(jobs.statusField,jobs.statusToString(jobs.STATUS_READYFORNOTIFY))}))
diff --git a/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java b/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
index da1f8e4..a13b6b5 100644
--- a/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
+++ b/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
@@ -176,7 +176,7 @@
ManifoldCFException abortOnFail;
if (!e.jobInactiveAbort() && e.isAbortOnFail())
- abortOnFail = new ManifoldCFException("Repeated service interruptions - failure performing notification"+((e.getCause()!=null)?": "+e.getCause().getMessage():""),e.getCause());
+ abortOnFail = new ManifoldCFException("Failure performing notification"+((e.getCause()!=null)?": "+e.getCause().getMessage():""),e.getCause());
else
abortOnFail = null;
@@ -192,7 +192,7 @@
// Note the error in the job, and transition to inactive state
if (abortOnFail != null)
Logging.jobs.error(abortOnFail.getMessage(),abortOnFail);
- jobManager.notifyAbort(jobID,(abortOnFail==null)?"":abortOnFail.getMessage());
+ jobManager.notifyAbort(jobID,(abortOnFail==null)?"":"Repeated service interruptions during notification: "+abortOnFail.getMessage()+": ending job");
jsr.noteStarted();
}
else
