Support config from system env in SentinelConfig and polish Transport…

…Config (#2154) - An improved method for obtaining IP address and port number from containers
alibaba · Apr 27, 2021 · 0d22aca · 0d22aca
1 parent 36b162c
commit 0d22aca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/config/SentinelConfig.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/config/SentinelConfig.java
@@ -125,6 +125,24 @@ public static String getConfig(String key) {
         AssertUtil.notNull(key, "key cannot be null");
         return props.get(key);
     }
+
+    /**
+     * Get config value of the specific key.
+     *
+     * @param key config key
+     * @param envVariableKey Get the value of the environment variable with the given key
+     * @return the config value.
+     */
+    public static String getConfig(String key, boolean envVariableKey) {
+        AssertUtil.notNull(key, "key cannot be null");
+        if (envVariableKey) {
+            String value = System.getenv(key);
+            if (StringUtil.isNotEmpty(value)) {
+                return value;
+            }
+        }
+        return getConfig(key);
+    }
 
     public static void setConfig(String key, String value) {
         AssertUtil.notNull(key, "key cannot be null");

diff --git a/...sport-common/src/main/java/com/alibaba/csp/sentinel/transport/config/TransportConfig.java b/...sport-common/src/main/java/com/alibaba/csp/sentinel/transport/config/TransportConfig.java
@@ -140,7 +140,7 @@ public static String getPort() {
         if (runtimePort > 0) {
             return String.valueOf(runtimePort);
         }
-        return SentinelConfig.getConfig(SERVER_PORT);
+        return SentinelConfig.getConfig(SERVER_PORT, true);
     }
 
     /**
@@ -159,7 +159,7 @@ public static void setRuntimePort(int port) {
      * @return the local ip.
      */
     public static String getHeartbeatClientIp() {
-        String ip = SentinelConfig.getConfig(HEARTBEAT_CLIENT_IP);
+        String ip = SentinelConfig.getConfig(HEARTBEAT_CLIENT_IP, true);
         if (StringUtil.isBlank(ip)) {
             ip = HostNameUtil.getIp();
         }