Author: kwright
Date: Sat Apr 29 00:56:18 2017
New Revision: 1793159
URL: http://svn.apache.org/viewvc?rev=1793159&view=rev
Log:
Tentative fix for CONNECTORS-1421.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1793159&r1=1793158&r2=1793159&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Apr 29 00:56:18 2017
@@ -3,6 +3,10 @@ $Id$
======================= 2.8-dev =====================
+CONNECTORS-1421: Have email connector retry when the connection
+is not established properly.
+(Cihad Guzel, Karl Wright)
+
CONNECTORS-1418: Build .less files into style.css as part of the build.
(Kishore Kumar, Karl Wright)
Modified:
manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1793159&r1=1793158&r2=1793159&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
(original)
+++
manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Sat Apr 29 00:56:18 2017
@@ -1755,8 +1755,14 @@ public class EmailConnector extends org.
protected static void handleMessagingException(MessagingException e, String
context)
throws ManifoldCFException, ServiceInterruption
{
- Logging.connectors.error("Email: Error "+context+": "+e.getMessage(),e);
- throw new ManifoldCFException("Error "+context+": "+e.getMessage(),e);
+ if (e.getMessage().indexOf("Connection dropped by server?") != -1) {
+ final long currentTime = System.currentTimeMillis();
+ throw new ServiceInterruption("Email server is down, retrying:
"+e.getMessage(),e,currentTime + 300000L,
+ currentTime + 12 * 60 * 60000L,-1,true);
+ } else {
+ Logging.connectors.error("Email: Error "+context+": "+e.getMessage(),e);
+ throw new ManifoldCFException("Error "+context+": "+e.getMessage(),e);
+ }
}
/** Handle IO Exception */
