re-use local server port when re-starting with ngrok if app is alread…

…y running
spring-attic · Sep 7, 2015 · d5209be · d5209be
1 parent 52512bf
commit d5209be
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/BootProjectDashElement.java b/...boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/BootProjectDashElement.java
@@ -454,12 +454,16 @@ else if (RunState.DEBUGGING.equals(runMode)) {
 			throw new IllegalArgumentException("Restart and expose expects RUNNING or DEBUGGING as 'goal' state");
 		}
 
+		int port = getLivePort();
 		stopSync();
 
-		int freePort = SocketUtil.findFreePort();
+		if (port <= 0) {
+			port = SocketUtil.findFreePort();
+		}
+
 		String tunnelName = getName();
 
-		NGROKTunnel tunnel = ngrokClient.startTunnel("http", Integer.toString(freePort));
+		NGROKTunnel tunnel = ngrokClient.startTunnel("http", Integer.toString(port));
 		NGROKLaunchTracker.add(tunnelName, ngrokClient, tunnel);
 
 		if (tunnel == null) {
@@ -474,7 +478,7 @@ else if (RunState.DEBUGGING.equals(runMode)) {
 		}
 
 		Map<String, String> extraAttributes = new HashMap<String, String>();
-		extraAttributes.put("spring.boot.prop.server.port", "1" + Integer.toString(freePort));
+		extraAttributes.put("spring.boot.prop.server.port", "1" + Integer.toString(port));
 		extraAttributes.put("spring.boot.prop.eureka.instance.hostname", "1" + tunnelURL);
 		extraAttributes.put("spring.boot.prop.eureka.instance.nonSecurePort", "1" + "80");
 		extraAttributes.put("spring.boot.prop.eureka.client.service-url.defaultZone", "1" + eurekaInstance);