Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize apollo extension #3263

Merged
merged 2 commits into from
Jan 17, 2019
Merged

optimize apollo extension #3263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ffa1b6
optimize apollo extension
chickenlj Jan 17, 2019
6c3fcc1
optimize apollo extension: specify the key to watch
chickenlj Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions ...rc/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;

import java.util.Arrays;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors;

/**
* Apollo implementation, https://github.com/ctripcorp/apollo
Expand All @@ -46,6 +49,7 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
private static final String APOLLO_ENV_KEY = "env";
private static final String APOLLO_ADDR_KEY = "apollo.meta";
private static final String APOLLO_CLUSTER_KEY = "apollo.cluster";
private static final String APOLLO_PROTOCOL_PREFIX = "http://";

private URL url;
private Config dubboConfig;
Expand All @@ -55,12 +59,12 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
this.url = url;
// Instead of using Dubbo's configuration, I would suggest use the original configuration method Apollo provides.
String configEnv = url.getParameter(APOLLO_ENV_KEY);
String configAddr = url.getBackupAddress();
String configAddr = getAddressWithProtocolPrefix(url);
String configCluster = url.getParameter(Constants.CONFIG_CLUSTER_KEY);
if (configEnv != null) {
System.setProperty(APOLLO_ENV_KEY, configEnv);
}
if (StringUtils.isEmpty(configEnv) && !Constants.ANYHOST_VALUE.equals(configAddr)) {
if (StringUtils.isEmpty(System.getProperty(APOLLO_ENV_KEY)) && !Constants.ANYHOST_VALUE.equals(configAddr)) {
System.setProperty(APOLLO_ADDR_KEY, configAddr);
}
if (configCluster != null) {
Expand All @@ -82,6 +86,21 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
}
}

private String getAddressWithProtocolPrefix (URL url) {
String address = url.getBackupAddress();
if (StringUtils.isNotEmpty(address)) {
address = Arrays.stream(Constants.COMMA_SPLIT_PATTERN.split(address))
.map(addr -> {
if (addr.startsWith(APOLLO_PROTOCOL_PREFIX)) {
return addr;
}
return APOLLO_PROTOCOL_PREFIX + addr;
})
.collect(Collectors.joining(","));
}
return address;
}

/**
* Since all governance rules will lay under dubbo group, this method now always uses the default dubboConfig and
* ignores the group parameter.
Expand All @@ -90,7 +109,7 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
public void addListener(String key, String group, ConfigurationListener listener) {
ApolloListener apolloListener = listeners.computeIfAbsent(group + key, k -> createTargetListener(key, group));
apolloListener.addListener(listener);
dubboConfig.addChangeListener(apolloListener);
dubboConfig.addChangeListener(apolloListener, Collections.singleton(key));
}

@Override
Expand All @@ -112,11 +131,8 @@ public void removeListener(String key, String group, ConfigurationListener liste
@Override
public String getConfig(String key, String group, long timeout) throws IllegalStateException {
if (StringUtils.isNotEmpty(group) && !url.getParameter(Constants.CONFIG_GROUP_KEY, DEFAULT_GROUP).equals(group)) {
Config config = ConfigService.getConfig(group);
if (config != null) {
return config.getProperty(key, null);
}
return null;
Config config = ConfigService.getAppConfig();
return config.getProperty(key, null);
}
return dubboConfig.getProperty(key, null);
}
Expand Down