always retry on 502 or 504 so ALB / ELB configuration is optional #999

ehennum · ehennum · commit e5b90af3c856 · 2018-09-25T13:13:35.000-04:00
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java
@@ -68,11 +68,6 @@ public DatabaseClientImpl(RESTServices services, String host, int port, String d
     this.securityContext = securityContext;
     this.connectionType  = connectionType;
 
-    if (connectionType == ConnectionType.GATEWAY) {
-      Set<Integer> retryStatus = services.getRetryStatus();
-      retryStatus.add(RESTServices.STATUS_BAD_GATEWAY);
-      retryStatus.add(RESTServices.STATUS_GATEWAY_TIMEOUT);
-    }
     services.setDatabaseClient(this);
   }
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java
@@ -247,7 +247,9 @@ protected ThreadState initialValue() {
   };
 
   public OkHttpServices() {
+    retryStatus.add(STATUS_BAD_GATEWAY);
     retryStatus.add(STATUS_SERVICE_UNAVAILABLE);
+    retryStatus.add(STATUS_GATEWAY_TIMEOUT);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,9 @@ protected ThreadState initialValue() {`
`247`	`247`	`};`
`248`	`248`
`249`	`249`	`public OkHttpServices() {`
	`250`	`+ retryStatus.add(STATUS_BAD_GATEWAY);`
`250`	`251`	`retryStatus.add(STATUS_SERVICE_UNAVAILABLE);`
	`252`	`+ retryStatus.add(STATUS_GATEWAY_TIMEOUT);`
`251`	`253`	`}`
`252`	`254`
`253`	`255`	`@Override`