Connect to go server to determine the agent ip address

gocd · Jul 7, 2016 · b283b42 · b283b42
1 parent c3c28d0
commit b283b42
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/agent/src/com/thoughtworks/go/agent/AgentController.java b/agent/src/com/thoughtworks/go/agent/AgentController.java
@@ -44,7 +44,13 @@
 import com.thoughtworks.go.server.service.AgentBuildingInfo;
 import com.thoughtworks.go.server.service.AgentRuntimeInfo;
 import com.thoughtworks.go.server.service.ElasticAgentRuntimeInfo;
-import com.thoughtworks.go.util.*;
+import com.thoughtworks.go.util.HttpService;
+import com.thoughtworks.go.util.SubprocessLogger;
+import com.thoughtworks.go.util.SystemEnvironment;
+import com.thoughtworks.go.util.SystemUtil;
+import com.thoughtworks.go.util.TimeProvider;
+import com.thoughtworks.go.util.URLService;
+import com.thoughtworks.go.util.ZipUtil;
 import com.thoughtworks.go.websocket.Action;
 import com.thoughtworks.go.websocket.Message;
 import com.thoughtworks.go.websocket.MessageCallback;
@@ -57,6 +63,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.Socket;
+import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -102,7 +110,7 @@ public AgentController(BuildRepositoryRemote server, GoArtifactsManipulator mani
         this.taskExtension = taskExtension;
         this.websocketService = websocketService;
         this.httpService = httpService;
-        ipAddress = SystemUtil.getFirstLocalNonLoopbackIpAddress();
+        ipAddress = SystemUtil.getClientIp(systemEnvironment.getServiceUrl());
         hostName = SystemUtil.getLocalhostNameOrRandomNameIfNotFound();
         this.server = server;
         this.manipulator = manipulator;
@@ -114,6 +122,7 @@ public AgentController(BuildRepositoryRemote server, GoArtifactsManipulator mani
         this.agentAutoRegistrationProperties = new AgentAutoRegistrationPropertiesImpl(new File("config", "autoregister.properties"));
     }
 
+
     void init() throws IOException {
         websocketService.setController(this);
         createPipelinesFolderIfNotExist();
@@ -360,11 +369,11 @@ private void runBuild(BuildSettings buildSettings) {
 
     private void cancelBuild() throws InterruptedException {
         BuildSession build = this.buildSession.get();
-        if(build == null) {
+        if (build == null) {
             return;
         }
         agentRuntimeInfo.cancel();
-        if(!build.cancel(30, TimeUnit.SECONDS)) {
+        if (!build.cancel(30, TimeUnit.SECONDS)) {
             LOG.error("Waited 30 seconds for canceling job finish, but the job is still running. Maybe canceling job does not work as expected, here is buildSession details: " + buildSession.get());
         }
     }

diff --git a/base/src/com/thoughtworks/go/util/SystemUtil.java b/base/src/com/thoughtworks/go/util/SystemUtil.java
@@ -24,6 +24,7 @@
 import java.net.NetworkInterface;
 import java.net.Socket;
 import java.net.SocketException;
+import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -189,4 +190,15 @@ public static int getIntProperty(String propertyName, int defaultValue) {
             return defaultValue;
         }
     }
+
+    public static String getClientIp(String serviceUrl) {
+        try {
+            URL url = new URL(serviceUrl);
+            try (Socket socket = new Socket(url.getHost(), url.getPort())) {
+                return socket.getLocalAddress().getHostAddress();
+            }
+        } catch (Exception e){
+            return SystemUtil.getFirstLocalNonLoopbackIpAddress();
+        }
+    }
 }