Skip to content

Commit f9719a8

Browse files
authored
Merge pull request #40 from chuntaojun/fix_err_log
fix: 修复 pickAddress 出现数组越界问题
2 parents e7f6514 + fb155d1 commit f9719a8

File tree

3 files changed

+11
-5
lines changed
  • polaris-sync-commons/src/main/java/cn/polarismesh/polaris/sync/common/rest
  • polaris-sync-registry-core/src/main/java/cn/polarismesh/polaris/sync/registry/tasks

3 files changed

+11
-5
lines changed

polaris-sync-commons/src/main/java/cn/polarismesh/polaris/sync/common/rest/RestOperator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.time.Duration;
2121
import java.util.List;
2222
import java.util.Random;
23+
import java.util.concurrent.ThreadLocalRandom;
2324
import org.springframework.boot.web.client.RestTemplateBuilder;
2425
import org.springframework.http.HttpEntity;
2526
import org.springframework.http.HttpMethod;
@@ -46,9 +47,8 @@ public static String pickAddress(List<String> addresses) {
4647
if (addresses.size() == 1) {
4748
return addresses.get(0);
4849
}
49-
Random random = new Random();
50-
int i = random.nextInt();
51-
return addresses.get(i % addresses.size());
50+
int i = ThreadLocalRandom.current().nextInt(addresses.size());
51+
return addresses.get(i);
5252
}
5353

5454
public <T> RestResponse<T> curlRemoteEndpoint(String url, HttpMethod method,

polaris-sync-registry-core/src/main/java/cn/polarismesh/polaris/sync/registry/tasks/PullTask.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
import cn.polarismesh.polaris.sync.registry.utils.ConfigUtils;
2727
import com.tencent.polaris.client.pb.ResponseProto.DiscoverResponse;
2828
import com.tencent.polaris.client.pb.ServiceProto.Instance;
29+
import java.io.ByteArrayInputStream;
30+
import java.io.PrintWriter;
31+
import java.io.StringWriter;
2932
import java.util.Collection;
3033
import java.util.HashMap;
3134
import java.util.List;
@@ -86,7 +89,10 @@ public void run() {
8689
}
8790
}
8891
} catch (Throwable e) {
89-
LOG.error("[Core] pull task(source {}) encounter exception", source.getName(), e);
92+
StringWriter sw = new StringWriter();
93+
PrintWriter pw = new PrintWriter(sw);
94+
e.printStackTrace(pw);
95+
LOG.error("[Core] pull task(source {}) encounter exception {}", source.getName(), sw);
9096
}
9197
}
9298

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</scm>
4747

4848
<properties>
49-
<revision>0.2.0-alpha.1</revision>
49+
<revision>0.2.0-alpha.2</revision>
5050
<timestamp>${maven.build.timestamp}</timestamp>
5151
<!-- Spring Cloud -->
5252
<spring.cloud.version>2021.0.3</spring.cloud.version>

0 commit comments

Comments
 (0)