Merge pull request #352 from code-dot-org/sanchit/connection-shut-down

Force recycle container if connection pool has been shut down

Author: sanchitmalhotra126

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/AWSOutputAdapter.java

@@ -44,6 +44,12 @@ private void sendMessageHelper(PostToConnectionRequest post) {
       this.api.postToConnection(post);
     } catch (GoneException e) {
       throw new InternalFacingRuntimeException(CONNECTION_TERMINATED, e);
+    } catch (IllegalStateException e) {
+      // Thrown when the API Gateway client has been unexpectedly shut down.
+      // We are still actively investigating why this happens in the first place,
+      // but this will make the container fail for all subsequent sessions, so it
+      // should be recycled.
+      throw new FatalError(FatalErrorKey.CONNECTION_POOL_SHUT_DOWN, e);
     }
   }
 }

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/FatalErrorKey.java

@@ -1,11 +1,11 @@
 package org.code.javabuilder;
 
-import static org.code.javabuilder.LambdaErrorCodes.LOW_DISK_SPACE_ERROR_CODE;
-import static org.code.javabuilder.LambdaErrorCodes.TEMP_DIRECTORY_CLEANUP_ERROR_CODE;
+import static org.code.javabuilder.LambdaErrorCodes.*;
 
 public enum FatalErrorKey {
   LOW_DISK_SPACE(LOW_DISK_SPACE_ERROR_CODE),
-  TEMP_DIRECTORY_CLEANUP_ERROR(TEMP_DIRECTORY_CLEANUP_ERROR_CODE);
+  TEMP_DIRECTORY_CLEANUP_ERROR(TEMP_DIRECTORY_CLEANUP_ERROR_CODE),
+  CONNECTION_POOL_SHUT_DOWN(CONNECTION_POOL_SHUT_DOWN_ERROR_CODE);
 
   private final int errorCode;
 

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/LambdaErrorCodes.java

@@ -8,4 +8,5 @@ private LambdaErrorCodes() {
   public static final int TEMP_DIRECTORY_CLEANUP_ERROR_CODE = 10;
   public static final int LOW_DISK_SPACE_ERROR_CODE = 50;
   public static final int OUT_OF_MEMORY_ERROR_CODE = 60;
+  public static final int CONNECTION_POOL_SHUT_DOWN_ERROR_CODE = 70;
 }

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/util/LambdaUtils.java

@@ -6,6 +6,7 @@
 import java.util.logging.Logger;
 import org.code.javabuilder.InternalFacingRuntimeException;
 import org.code.protocol.ClientMessage;
+import org.code.protocol.JavabuilderThrowableMessageUtils;
 import org.code.protocol.OutputAdapter;
 
 public final class LambdaUtils {
@@ -33,7 +34,7 @@ public static void safelySendMessage(
       }
     } catch (Exception e) {
       // Catch any other exceptions here to prevent them from propagating.
-      Logger.getLogger(MAIN_LOGGER).warning(e.getMessage());
+      Logger.getLogger(MAIN_LOGGER).warning(JavabuilderThrowableMessageUtils.getLoggingString(e));
     }
   }
 }