Skip to content

Commit 5a22bb7

Browse files
committed
ribbon
1 parent 4179579 commit 5a22bb7

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

txlcn-tracing/src/main/java/com/codingapi/txlcn/tracing/http/ribbon/LoadbalancerConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class LoadbalancerConfiguration {
3535

3636
@Bean
37-
@ConditionalOnProperty(name = "tx-lcn.ribbon.loadbalancer.dtx.enabled", havingValue = "true")
37+
@ConditionalOnProperty(name = "tx-lcn.ribbon.loadbalancer.dtx.enabled", matchIfMissing = true)
3838
@Scope("prototype")
3939
public IRule ribbonRule(Registration registration) {
4040
return new TxlcnZoneAvoidanceRule(registration);

txlcn-tracing/src/main/java/com/codingapi/txlcn/tracing/http/ribbon/TxlcnZoneAvoidanceRule.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ public TxlcnZoneAvoidanceRule() {
5050

5151
@Override
5252
public Server choose(Object key) {
53-
//非分布式事务直接执行默认业务.
54-
if(!TracingContext.tracing().hasGroup()){
53+
// 0. 非分布式事务直接执行默认业务.
54+
if (!TracingContext.tracing().hasGroup()) {
5555
return super.choose(key);
5656
}
5757

5858
// 1. 自己加入此事务组调用链
59-
assert registration != null;
59+
assert Objects.nonNull(registration);
6060
TracingContext.tracing().addApp(registration.getServiceId(), registration.getHost() + ":" + registration.getPort());
6161

6262
// 2. 获取所有要访问服务的实例
6363
List<Server> servers = getLoadBalancer().getAllServers();
64-
assert servers.size() > 0;
64+
assert !servers.isEmpty();
6565

6666
JSONObject appMap = TracingContext.tracing().appMap();
6767
log.debug("load balanced rule servers: {}, txGroup[{}]'s server map:{}",
@@ -71,7 +71,7 @@ public Server choose(Object key) {
7171
if (appMap.containsKey(serviceId)) {
7272
for (Server server : servers) {
7373
if (server.getHostPort().equals(appMap.getString(serviceId))) {
74-
log.debug("txlcn choosed server [{}] in txGroup: {}", server, TracingContext.tracing().groupId());
74+
log.debug("txlcn chosen server [{}] in txGroup: {}", server, TracingContext.tracing().groupId());
7575
balanceServer = server;
7676
}
7777
}

0 commit comments

Comments
 (0)