Skip to content

Commit 21ccce9

Browse files
fix(config-etcd): 修复 EtcdConfig 默认连接字符串并统一命名风格
- 将 EtcdConfig 类中的属性名称从连字符风格改为驼峰风格 - 修改默认连接字符串从 ZooKeeper 地址改为 Etcd 默认地址 - 在 demo-etcd 的 pom 文件中添加新的配置属性
1 parent e2c32cc commit 21ccce9

File tree

2 files changed

+8
-7
lines changed
  • demo/demo-etcd/test-client
  • dynamic-config/config-etcd/src/main/java/org/apache/servicecomb/config/etcd

2 files changed

+8
-7
lines changed

demo/demo-etcd/test-client/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<env>
129129
<JAVA_OPTS>
130130
-Dservicecomb.registry.etcd.connectString=http://etcd:2379
131+
-Dservicecomb.config.etcd.connectString=http://etcd:2379
131132
</JAVA_OPTS>
132133
<JAR_PATH>/maven/maven/etcd-consumer-${project.version}.jar</JAR_PATH>
133134
</env>

dynamic-config/config-etcd/src/main/java/org/apache/servicecomb/config/etcd/EtcdConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
public class EtcdConfig {
2222
public static final String ZOOKEEPER_DEFAULT_ENVIRONMENT = "production";
2323

24-
public static final String PROPERTY_CONNECT_STRING = "servicecomb.config.etcd.connect-string";
24+
public static final String PROPERTY_CONNECT_STRING = "servicecomb.config.etcd.connectString";
2525

26-
public static final String PROPERTY_SESSION_TIMEOUT = "servicecomb.config.etcd.session-timeout-millis";
26+
public static final String PROPERTY_SESSION_TIMEOUT = "servicecomb.config.etcd.sessionTimeoutMillis";
2727

28-
public static final String PROPERTY_CONNECTION_TIMEOUT = "servicecomb.config.etcd.connection-timeout-mills";
28+
public static final String PROPERTY_CONNECTION_TIMEOUT = "servicecomb.config.etcd.connectionTimeoutMills";
2929

30-
public static final String PROPERTY_AUTH_SCHEMA = "servicecomb.config.etcd.authentication-schema";
30+
public static final String PROPERTY_AUTH_SCHEMA = "servicecomb.config.etcd.authenticationSchema";
3131

32-
public static final String PROPERTY_AUTH_INFO = "servicecomb.config.etcd.authentication-info";
32+
public static final String PROPERTY_AUTH_INFO = "servicecomb.config.etcd.authenticationInfo";
3333

34-
public static final String PROPERTY_INSTANCE_TAG = "servicecomb.config.etcd.instance-tag";
34+
public static final String PROPERTY_INSTANCE_TAG = "servicecomb.config.etcd.instanceTag";
3535

3636
private final Environment environment;
3737

@@ -40,7 +40,7 @@ public EtcdConfig(Environment environment) {
4040
}
4141

4242
public String getConnectString() {
43-
return environment.getProperty(PROPERTY_CONNECT_STRING, "http://127.0.0.1:2181");
43+
return environment.getProperty(PROPERTY_CONNECT_STRING, "http://127.0.0.1:2379");
4444
}
4545

4646
public int getSessionTimeoutMillis() {

0 commit comments

Comments
 (0)