Author: kwright
Date: Tue Oct 21 13:45:07 2014
New Revision: 1633379
URL: http://svn.apache.org/r1633379
Log:
Pull up more CONNECTORS-1077 changes
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
manifoldcf/branches/dev_1x/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1633378
Modified:
manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java?rev=1633379&r1=1633378&r2=1633379&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
Tue Oct 21 13:45:07 2014
@@ -23,7 +23,9 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.HttpClient;
import java.io.IOException;
+import java.util.Locale;
+import org.apache.manifoldcf.agents.interfaces.IOutputHistoryActivity;
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
import org.apache.manifoldcf.crawler.system.Logging;
@@ -51,7 +53,7 @@ public class ElasticSearchAction extends
String error = checkJson(jsonException);
if (getResult() == Result.OK && error == null)
return;
- setResult(Result.ERROR, error);
+ setResult(IOutputHistoryActivity.JSON_ERROR,Result.ERROR, error);
Logging.connectors.warn("ES: Commit failed: "+getResponse());
}
@@ -61,7 +63,7 @@ public class ElasticSearchAction extends
// We want a quicker failure here!!
if (e instanceof java.io.InterruptedIOException && !(e instanceof
java.net.SocketTimeoutException))
throw new
ManifoldCFException(e.getMessage(),ManifoldCFException.INTERRUPTED);
- setResult(Result.ERROR, e.getMessage());
+
setResult(e.getClass().getSimpleName().toUpperCase(Locale.ROOT),Result.ERROR,
e.getMessage());
long currentTime = System.currentTimeMillis();
// One notification attempt, then we're done.
throw new ServiceInterruption("IO exception: "+e.getMessage(),e,
Modified:
manifoldcf/branches/dev_1x/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java?rev=1633379&r1=1633378&r2=1633379&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
Tue Oct 21 13:45:07 2014
@@ -178,6 +178,7 @@ public class HttpPoster
}
else
// Can't accept the document, because we don't know how to secure it
+
activities.recordActivity(null,GTSConnector.INGEST_ACTIVITY,null,documentURI,activities.UNKNOWN_SECURITY,"Rejected
document that has security info which GTS does not recognize: '"+ securityType
+ "'");
return false;
}
@@ -209,7 +210,7 @@ public class HttpPoster
// Log the activity, if any, regardless of any exception
if (t.getActivityCode() != null)
-
activities.recordActivity(t.getActivityStart(),GTSConnector.INGEST_ACTIVITY,t.getActivityBytes(),documentURI,t.getActivityCode(),t.getActivityDetails());
+
activities.recordActivity(t.getActivityStart(),GTSConnector.INGEST_ACTIVITY,t.getActivityBytes(),documentURI,t.getException().getClass().getSimpleName().toUpperCase(Locale.ROOT),t.getActivityDetails());
readFromDocumentStreamYet = (readFromDocumentStreamYet ||
t.getReadFromDocumentStreamYet());
@@ -410,7 +411,7 @@ public class HttpPoster
// Log the activity, if any, regardless of any exception
if (t.getActivityCode() != null)
-
activities.recordActivity(t.getActivityStart(),GTSConnector.REMOVE_ACTIVITY,null,documentURI,t.getActivityCode(),t.getActivityDetails());
+
activities.recordActivity(t.getActivityStart(),GTSConnector.REMOVE_ACTIVITY,null,documentURI,t.getException().getClass().getSimpleName().toUpperCase(Locale.ROOT),t.getActivityDetails());
Throwable thr = t.getException();
if (thr != null)
Modified:
manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java?rev=1633379&r1=1633378&r2=1633379&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
Tue Oct 21 13:45:07 2014
@@ -39,6 +39,6 @@ public class OpenSearchServerAction exte
call(method);
if ("OK".equals(checkXPath(xPathStatus)))
return;
- setResult(IOutputHistoryActivity.JSON_ERROR,Result.ERROR,
checkXPath(xPathException));
+ setResult(IOutputHistoryActivity.XPATH_EXCEPTION,Result.ERROR,
checkXPath(xPathException));
}
}
