Merge pull request #177 from socrata/rjm/handle-socket-errors-while-u…

…pdating-log-dataset-en-14775 Handle socket errors while updating logging dataset
socrata · Sep 5, 2017 · d7fee14 · d7fee14
2 parents 03c862b + 68be75c
commit d7fee14
Showing 1 changed file with 30 additions and 7 deletions.
diff --git a/src/main/java/com/socrata/datasync/job/IntegrationJob.java b/src/main/java/com/socrata/datasync/job/IntegrationJob.java
@@ -25,6 +25,7 @@
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.sun.jersey.api.client.ClientHandlerException;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -33,6 +34,7 @@
 import java.io.InputStream;
 import java.io.ObjectInput;
 import java.io.ObjectInputStream;
+import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -387,13 +389,34 @@ public static String addLogEntry(final String logDatasetID, final SocrataConnect
         upsertObjects.add(ImmutableMap.copyOf(newCols));
 
         String logPublishingErrorMessage = null;
-        try {
-            producer.upsert(logDatasetID, upsertObjects);
-        }
-        catch (SodaError | InterruptedException e) {
-            e.printStackTrace();
-            logPublishingErrorMessage = e.getMessage();
-        }
+
+        int retryLimit = 10;
+        boolean retry;
+        do {
+            retry = false;
+            try {
+                producer.upsert(logDatasetID, upsertObjects);
+            }
+            catch (SodaError | InterruptedException e) {
+                e.printStackTrace();
+                logPublishingErrorMessage = e.getMessage();
+            }
+            catch (ClientHandlerException e) {
+                if(e.getCause() instanceof SocketException) {
+                    System.out.println("Socket exception while updating logging dataset: " + e.getCause().getMessage());
+                    if(retryLimit-- > 0) {
+                        System.out.println("Retrying");
+                        retry = true;
+                    } else {
+                        e.printStackTrace();
+                        logPublishingErrorMessage = e.getMessage();
+                    }
+                } else {
+                    throw e;
+                }
+            }
+        } while(retry);
+
         return logPublishingErrorMessage;
     }