Add a switch for dynamically obtaining environment variables

Author: chenzhiguo

joylive-core/joylive-core-framework/src/main/java/com/jd/live/agent/core/bootstrap/env/http/HttpEnvSupplier.java

@@ -49,6 +49,9 @@ public class HttpEnvSupplier extends AbstractEnvSupplier {
     private static final String KEY_NACOS_NAMESPACE = "CONFIG_NACOS_NAMESPACE";
     private static final String KEY_NACOS_SERVICE = "CONFIG_NACOS_SERVICE";
 
+    @Config("env.http.enabled")
+    private boolean enabled;
+
     @Config("env.http.url")
     private String url;
 
@@ -76,6 +79,10 @@ public class HttpEnvSupplier extends AbstractEnvSupplier {
     @Override
     public void process(AppEnv env) {
         env.setEnvironment(environment);
+        if (!enabled) {
+            logger.info("Ignore loading env from http, caused by enabled switch.");
+            return;
+        }
         if (isEmpty(url)) {
             String serviceApi = env.getString(KEY_SERVICE_API_URL);
             if (isEmpty(serviceApi)) {

joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/config/RegistryRole.java

@@ -24,7 +24,7 @@
 public enum RegistryRole {
 
     /**
-     * Primary role with highest priority (order=2).
+     * Primary role with the highest priority (order=2).
      */
     PRIMARY(0),
 
@@ -34,7 +34,7 @@ public enum RegistryRole {
     SYSTEM(1),
 
     /**
-     * Secondary role with lowest priority (order=0).
+     * Secondary role with the lowest priority (order=0).
      */
     SECONDARY(2);
 

joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/registry/LiveRegistry.java

@@ -316,11 +316,11 @@ public CompletionStage<List<ServiceEndpoint>> getEndpoints(String service, Strin
                             future.complete(v);
                         } else {
                             // don't convert service name in system registry
-                            system.getEndpoints(service).whenComplete((e, r) -> {
-                                if (r != null) {
-                                    future.completeExceptionally(r);
+                            system.getEndpoints(service).whenComplete((r, e) -> {
+                                if (e != null) {
+                                    future.completeExceptionally(e);
                                 } else {
-                                    future.complete(e);
+                                    future.complete(r);
                                 }
                             });
                         }

joylive-package/src/main/assembly/config/bootstrap.properties

@@ -47,6 +47,7 @@ cipher.iv=${CONFIG_CIPHER_IV}
 cipher.ivSize=${CONFIG_CIPHER_IV_SIZE:16}
 cipher.iterations=${CONFIG_CIPHER_ITERATIONS:1000}
 cipher.properties=${CONFIG_CIPHER_PROPERTIES}
+env.http.enabled=${CONFIG_ENV_HTTP_ENABLED:false}
 env.http.url=${CONFIG_ENV_HTTP_URL}
 env.http.environment=${CONFIG_ENV_HTTP_ENVIRONMENT:false}
 env.http.parameters=${CONFIG_ENV_HTTP_PARAMETERS}