Merge pull request #40 from chuntaojun/fix_err_log

fix: 修复 pickAddress 出现数组越界问题
polaris-contrib · Aug 24, 2022 · f9719a8 · f9719a8
2 parents e7f6514 + fb155d1
commit f9719a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/polaris-sync-commons/src/main/java/cn/polarismesh/polaris/sync/common/rest/RestOperator.java b/polaris-sync-commons/src/main/java/cn/polarismesh/polaris/sync/common/rest/RestOperator.java
@@ -20,6 +20,7 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -46,9 +47,8 @@ public static String pickAddress(List<String> addresses) {
         if (addresses.size() == 1) {
             return addresses.get(0);
         }
-        Random random = new Random();
-        int i = random.nextInt();
-        return addresses.get(i % addresses.size());
+        int i = ThreadLocalRandom.current().nextInt(addresses.size());
+        return addresses.get(i);
     }
 
     public <T> RestResponse<T> curlRemoteEndpoint(String url, HttpMethod method,

diff --git a/...sync-registry-core/src/main/java/cn/polarismesh/polaris/sync/registry/tasks/PullTask.java b/...sync-registry-core/src/main/java/cn/polarismesh/polaris/sync/registry/tasks/PullTask.java
@@ -26,6 +26,9 @@
 import cn.polarismesh.polaris.sync.registry.utils.ConfigUtils;
 import com.tencent.polaris.client.pb.ResponseProto.DiscoverResponse;
 import com.tencent.polaris.client.pb.ServiceProto.Instance;
+import java.io.ByteArrayInputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -86,7 +89,10 @@ public void run() {
                 }
             }
         } catch (Throwable e) {
-            LOG.error("[Core] pull task(source {}) encounter exception", source.getName(), e);
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            LOG.error("[Core] pull task(source {}) encounter exception {}", source.getName(), sw);
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
     </scm>
 
     <properties>
-        <revision>0.2.0-alpha.1</revision>
+        <revision>0.2.0-alpha.2</revision>
         <timestamp>${maven.build.timestamp}</timestamp>
         <!-- Spring Cloud -->
         <spring.cloud.version>2021.0.3</spring.cloud.version>