svn commit: r1445044 - in /manifoldcf/trunk: ./ connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/

[kwright]

Author: kwright
Date: Tue Feb 12 07:47:22 2013
New Revision: 1445044

URL: http://svn.apache.org/r1445044
Log:
Fix for CONNECTORS-643.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1445044&r1=1445043&r2=1445044&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Feb 12 07:47:22 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.2-dev =====================
 
+CONNECTORS-643: Fix spurious error report for Elastic Search deletions
+in Simple History.
+(Karl Wright)
+
 CONNECTORS-641: Add filename, mimetype, acls, and proper escaping
 to ElasticSearch connector.
 (Karl Wright)

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java?rev=1445044&r1=1445043&r2=1445044&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
 Tue Feb 12 07:47:22 2013
@@ -24,6 +24,7 @@ import org.apache.http.client.HttpClient
 
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
+import org.apache.manifoldcf.crawler.system.Logging;
 
 public class ElasticSearchAction extends ElasticSearchConnection
 {
@@ -48,5 +49,6 @@ public class ElasticSearchAction extends
     if ("true".equals(checkJson(jsonStatus)))
       return;
     setResult(Result.ERROR, checkJson(jsonException));
+    Logging.connectors.warn("ES: Commit failed: "+getResponse());
   }
 }

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java?rev=1445044&r1=1445043&r2=1445044&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
 Tue Feb 12 07:47:22 2013
@@ -239,12 +239,12 @@ public class ElasticSearchConnection
     }
     else if (code == 404)
     {
-      setResult(Result.ERROR, response);
+      setResult(Result.ERROR, "Page not found: " + response);
       throw new ManifoldCFException("Server/page not found");
     }
     else if (code >= 400 && code < 500)
     {
-      setResult(Result.ERROR, response);
+      setResult(Result.ERROR, "HTTP code = "+code+", Response = "+response);
       return false;
     }
     else if (code >= 500 && code < 600)
@@ -258,7 +258,7 @@ public class ElasticSearchConnection
         -1,
         false);
     }
-    setResult(Result.UNKNOWN, response);
+    setResult(Result.UNKNOWN, "HTTP code = "+code+", Response = "+response);
     throw new ManifoldCFException("Unexpected HTTP result code: "+code+": 
"+response);
   }
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java?rev=1445044&r1=1445043&r2=1445044&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
 Tue Feb 12 07:47:22 2013
@@ -24,6 +24,7 @@ import org.apache.http.client.methods.Ht
 
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
+import org.apache.manifoldcf.crawler.system.Logging;
 
 public class ElasticSearchDelete extends ElasticSearchConnection
 {
@@ -43,9 +44,12 @@ public class ElasticSearchDelete extends
           "/" + config.getIndexName() + "/" + config.getIndexType()
           + "/" + idField);
       call(method);
-      if ("ok".equals(jsonStatus))
+      if ("true".equals(checkJson(jsonStatus)))
         return;
+      // We thought we needed to delete, but ElasticSearch disagreed.
+      // Log the result as an error, but proceed anyway.
       setResult(Result.ERROR, checkJson(jsonException));
+      Logging.connectors.warn("ES: Delete failed: "+getResponse());
     }
     catch (java.io.UnsupportedEncodingException e)
     {

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java?rev=1445044&r1=1445043&r2=1445044&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
 Tue Feb 12 07:47:22 2013
@@ -222,7 +222,7 @@ public class ElasticSearchIndex extends 
       return true;
     String error = checkJson(jsonException);
     setResult(Result.ERROR, error);
-    Logging.connectors.error(getResponse());
+    Logging.connectors.warn("ES: Index failed: "+getResponse());
     return true;
   }