Fixes #20: Fix runtime port and heartbeat sending logic

- Sentinel should not send heartbeat to dashboard until the runtime port has been settled down

Signed-off-by: Eric Zhao <[email protected]>

Author: sczyh30

sentinel-transport/sentinel-transport-common/src/main/java/com/alibaba/csp/sentinel/transport/config/TransportConfig.java

@@ -42,6 +42,10 @@ public static String getConsoleServer() {
         return SentinelConfig.getConfig(CONSOLE_SERVER);
     }
 
+    public static int getRuntimePort() {
+        return runtimePort;
+    }
+
     /**
      * Get Server port of this HTTP server.
      *

sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/command/SimpleHttpCommandCenter.java

@@ -124,9 +124,7 @@ public void run() {
                     }
                 }
 
-                if (success) {
-                    tmpPort = port;
-                } else {
+                if (!success) {
                     tmpPort = PORT_UNINITIALIZED;
                 }
                 TransportConfig.setRuntimePort(tmpPort);

sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/SimpleHttpHeartbeatSender.java

@@ -52,7 +52,7 @@ public class SimpleHttpHeartbeatSender implements HeartbeatSender {
     public SimpleHttpHeartbeatSender() {
         // Retrieve the list of default addresses.
         List<InetSocketAddress> newAddrs = getDefaultConsoleIps();
-        RecordLog.info("Default console address list retrieved: " + newAddrs);
+        RecordLog.info("[SimpleHttpHeartbeatSender] Default console address list retrieved: " + newAddrs);
         this.addressList = newAddrs;
         // Set interval config.
         String interval = System.getProperty(TransportConfig.HEARTBEAT_INTERVAL_MS, String.valueOf(DEFAULT_INTERVAL));
@@ -61,6 +61,10 @@ public SimpleHttpHeartbeatSender() {
 
     @Override
     public boolean sendHeartbeat() throws Exception {
+        if (TransportConfig.getRuntimePort() <= 0) {
+            RecordLog.info("[SimpleHttpHeartbeatSender] Runtime port not initialized, won't send heartbeat");
+            return false;
+        }
         InetSocketAddress addr = getAvailableAddress();
         if (addr == null) {
             return false;