fix bug

FederatedAI · Sep 14, 2021 · 0fee712 · 0fee712
1 parent 3be1c9d
commit 0fee712
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/fate-serving-server/src/main/java/com/webank/ai/fate/serving/Bootstrap.java b/fate-serving-server/src/main/java/com/webank/ai/fate/serving/Bootstrap.java
@@ -84,7 +84,7 @@ public static void parseConfig() {
             MetaInfo.PROPERTY_FEATURE_SINGLE_ADAPTOR = environment.getProperty(Dict.PROPERTY_FEATURE_SINGLE_ADAPTOR);
             MetaInfo.PROPERTY_USE_REGISTER = environment.getProperty(Dict.PROPERTY_USE_REGISTER) != null ? Boolean.valueOf(environment.getProperty(Dict.PROPERTY_USE_REGISTER)) : true;
             MetaInfo.PROPERTY_USE_ZK_ROUTER = environment.getProperty(Dict.PROPERTY_USE_ZK_ROUTER) != null ? Boolean.valueOf(environment.getProperty(Dict.PROPERTY_USE_ZK_ROUTER)) : true;
-            MetaInfo.PROPERTY_PORT = environment.getProperty(Dict.PORT) != null ? Integer.valueOf(environment.getProperty(Dict.PORT)) : 8000;
+            MetaInfo.PROPERTY_SERVER_PORT = environment.getProperty(Dict.PORT) != null ? Integer.valueOf(environment.getProperty(Dict.PORT)) : 8000;
             MetaInfo.PROPERTY_ZK_URL = environment.getProperty(Dict.PROPERTY_ZK_URL);
             MetaInfo.PROPERTY_CACHE_TYPE = environment.getProperty(Dict.PROPERTY_CACHE_TYPE, "local");
             MetaInfo.PROPERTY_REDIS_IP = environment.getProperty(Dict.PROPERTY_REDIS_IP);

diff --git a/fate-serving-server/src/main/java/com/webank/ai/fate/serving/ServingConfig.java b/fate-serving-server/src/main/java/com/webank/ai/fate/serving/ServingConfig.java
@@ -46,7 +46,7 @@ public class ServingConfig {
     @Conditional({UseZkCondition.class})
     ZookeeperRegistry getServiceRegistry() {
         Preconditions.checkArgument(StringUtils.isNotEmpty(MetaInfo.PROPERTY_ZK_URL));
-        return ZookeeperRegistry.createRegistry(MetaInfo.PROPERTY_ZK_URL, Dict.SERVICE_SERVING, Dict.ONLINE_ENVIRONMENT, MetaInfo.PROPERTY_PORT);
+        return ZookeeperRegistry.createRegistry(MetaInfo.PROPERTY_ZK_URL, Dict.SERVICE_SERVING, Dict.ONLINE_ENVIRONMENT, MetaInfo.PROPERTY_SERVER_PORT);
     }
 
     @Bean

diff --git a/fate-serving-server/src/main/java/com/webank/ai/fate/serving/ServingServer.java b/fate-serving-server/src/main/java/com/webank/ai/fate/serving/ServingServer.java
@@ -61,7 +61,7 @@ public void afterPropertiesSet() throws Exception {
                 MetaInfo.PROPERTY_SERVING_POOL_QUEUE_SIZE == 0 ? new SynchronousQueue<Runnable>() :
                         (MetaInfo.PROPERTY_SERVING_POOL_QUEUE_SIZE < 0 ? new LinkedBlockingQueue<Runnable>()
                                 : new LinkedBlockingQueue<Runnable>(MetaInfo.PROPERTY_SERVING_POOL_QUEUE_SIZE)), new NamedThreadFactory("ServingServer", true));
-        FateServerBuilder serverBuilder = (FateServerBuilder) ServerBuilder.forPort(MetaInfo.PROPERTY_PORT);
+        FateServerBuilder serverBuilder = (FateServerBuilder) ServerBuilder.forPort(MetaInfo.PROPERTY_SERVER_PORT);
         serverBuilder.keepAliveTime(100, TimeUnit.MILLISECONDS);
         serverBuilder.executor(executor);
         serverBuilder.addService(ServerInterceptors.intercept(guestInferenceService, new ServiceExceptionHandler(), new ServiceOverloadProtectionHandle()), GuestInferenceService.class);

diff --git a/fate-serving-server/src/main/java/com/webank/ai/fate/serving/model/FateFlowModelLoader.java b/fate-serving-server/src/main/java/com/webank/ai/fate/serving/model/FateFlowModelLoader.java
@@ -35,7 +35,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.*;
@@ -192,6 +191,6 @@ public void afterPropertiesSet() throws Exception {
         String modelParentPathx = "/" + Dict.DEFAULT_FATE_ROOT + "/" + TRANSFER_URI + "/providers";
         String modelParentPath = "/";
         List<String> children = zookeeperRegistry.getZkClient().getChildren(modelParentPathx);
-        logger.info("children = {}", children);
+//        logger.info("children = {}", children);
     }
 }