Author: kwright
Date: Thu Feb 6 21:48:50 2014
New Revision: 1565449
URL: http://svn.apache.org/r1565449
Log:
Debug
Modified:
manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
Modified:
manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1565449&r1=1565448&r2=1565449&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++
manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Thu Feb 6 21:48:50 2014
@@ -431,6 +431,19 @@ public class HttpPoster
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
Modified:
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1565449&r1=1565448&r2=1565449&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Thu Feb 6 21:48:50 2014
@@ -7302,7 +7302,7 @@ public class JobManager implements IJobM
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))}))
Modified:
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java?rev=1565449&r1=1565448&r2=1565449&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
(original)
+++
manifoldcf/branches/CONNECTORS-833/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
Thu Feb 6 21:48:50 2014
@@ -176,7 +176,7 @@ public class JobNotificationThread exten
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 @@ public class JobNotificationThread exten
// 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
