Fix bug where SimpleServer will use 100% CPU if the Request is never received

octopus-java/octopus-commons/src/main/java/com/chaos/octopus/commons/http/SimpleServer.java

@@ -74,7 +74,7 @@ public class SimpleServer implements Runnable{
       } catch (SocketException se) {
         // if the socket is closed it means the server is turned off, so we can ignore the exception
         if (!socket.isClosed()) se.printStackTrace();
-      } catch (IOException e) {
+      } catch (Exception e) {
         e.printStackTrace();
       }
     }
@@ -86,8 +86,15 @@ public class SimpleServer implements Runnable{
       return new Response<>(new Response.Error("Endpoint not found: " + request.endpoint));
     }
 
-    String readRequestFromStream() throws IOException {
-      while(socket.getInputStream().available() == 0);
+    String readRequestFromStream() throws Exception {
+      long timeout = System.currentTimeMillis() + 5000;
+
+      while(socket.getInputStream().available() == 0 && timeout > System.currentTimeMillis()){
+        Thread.sleep(1);
+      }
+
+      if(socket.getInputStream().available() == 0)
+        throw new Error("Connection closed before request data was sent");
 
       String requestString = "";
 

octopus-java/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java

@@ -22,20 +22,6 @@ public class HeartbeatTest {
     assertTrue(chaos.wasHeartbeatSet);
   }
 
-  @Test
-  public void sdfsdf() throws IOException {
-    Chaos chaos = new Chaos("https://dev-api.cosound.dk/v6");
-
-    AuthenticatedChaosClient authenticate = chaos.authenticate("90f4183870e5d60bbb1b595c10f0c48a4edb17a1befeaee3e4146a9d492f0c84");
-    ClusterState state = new ClusterState();
-    state.queueSize = 1;
-    state.agents = new ArrayList<>();
-    ClusterState.AgentState agentState = new ClusterState.AgentState();
-    agentState.state = "Disconnected";
-    state.agents.add(agentState);
-    authenticate.set(state);
-  }
-
   private class ChaosMock implements HeartbeatGateway {
     public boolean wasHeartbeatSet = false;