Add message when an Agent connect to the orchestrator

octopus-java/octopus-agent/src/main/java/com/chaos/octopus/agent/OrchestratorProxy.java

@@ -12,13 +12,13 @@ import java.net.Inet4Address;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-public class OrchestratorProxy implements Orchestrator {
+class OrchestratorProxy implements Orchestrator {
   private final int port;
   private final String hostname;
   private int _localListenPort;
   private String _localHostAddress;
 
-  public OrchestratorProxy(String hostname, int port, int listenPort) {
+  OrchestratorProxy(String hostname, int port, int listenPort) {
     _localHostAddress = getHostAddress();
     _localListenPort = listenPort;
     this.port = port;
@@ -41,6 +41,8 @@ public class OrchestratorProxy implements Orchestrator {
     sendResponse("Agent/Connect",
         new KeyValue("hostname", _localHostAddress),
         new KeyValue("port", _localListenPort + ""));
+
+    System.out.println("Connected to orchestrator");
   }
 
   public void taskCompleted(Task task) {

octopus-java/octopus-server/src/main/java/com/chaos/octopus/server/AgentProxy.java

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 public class AgentProxy {
-  public final int port;
+  private final int port;
   private final String hostname;
   private List<String> _SupportedPlugins;
   private int _MaxNumberOfSimultaneousTasks;
@@ -63,7 +63,7 @@ public class AgentProxy {
     sendRequest("Task/Enqueue", new KeyValue("task", taskString));
   }
 
-  public ClusterState.AgentState getAgentState() throws DisconnectError {
+  ClusterState.AgentState getAgentState() throws DisconnectError {
     AgentStateResult result = (AgentStateResult) sendRequest("State/Get",
             new TypeToken<Response<AgentStateResult>>() {
             }.getType()).Results.get(0);
@@ -74,11 +74,11 @@ public class AgentProxy {
     return result.agentState;
   }
 
-  public void taskCompleted(Task task) {
+  void taskCompleted(Task task) {
     _AllocatedTasks.remove(task.taskId);
   }
 
-  public boolean isQueueFull() {
+  boolean isQueueFull() {
     return _MaxNumberOfSimultaneousTasks - _AllocatedTasks.size() == 0;
   }
 
@@ -106,7 +106,7 @@ public class AgentProxy {
     return state;
   }
 
-  public String getHostname() {
+  String getHostname() {
     return hostname;
   }
 
@@ -132,10 +132,14 @@ public class AgentProxy {
   }
 
   private <T> Response<T> sendRequest(String message, Type t, int retries) {
+
 		try (Socket socket = new Socket(hostname, port)) {
 			socket.getOutputStream().write(message.getBytes());
 
-      while (socket.getInputStream().available() == 0) {
+      long timeout = System.currentTimeMillis() + 5000;
+
+      while (socket.getInputStream().available() == 0 && timeout > System.currentTimeMillis()) {
+        Thread.sleep(1);
       }
 
       String reaponseString = "";
@@ -155,7 +159,7 @@ public class AgentProxy {
               "Connection to Orchestrator could not be established, check hostname and port", e);
     } catch (Exception e) {
       if (retries > 0) {
-        sleep(250);
+				sleep(100);
         sendRequest(message, t, --retries);
       }
 

octopus-java/octopus-server/src/main/java/com/chaos/octopus/server/endpoint/AgentConnectEndpoint.java

@@ -24,6 +24,8 @@ public class AgentConnectEndpoint implements Endpoint {
       ap.InitializeAgent();
 
       allocationHandler.addAgent(ap);
+
+			System.out.println("Agent Connected");
     } catch (ConnectException e) {
       System.err.println("Connection to Agent could not be established, hostname: " + hostname + ", port: " + port);
       e.printStackTrace();