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

[Dubbo-3669]do local export before register any listener. #3685

Merged
merged 5 commits into from
May 16, 2019
Merged

[Dubbo-3669]do local export before register any listener. #3685

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
387013d
do local export before register any listener.
chickenlj Mar 18, 2019
de3d6f6
revert delete of ProviderConfigurationListener init.
chickenlj May 14, 2019
f484415
only parse rules on init, does not override.
chickenlj May 16, 2019
d7c6589
revert change in RegistryProtocol
chickenlj May 16, 2019
2c17623
extract code to one single method.
chickenlj May 16, 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
24 changes: 16 additions & 8 deletions ...api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected final void initWith(String key) {
dynamicConfiguration.addListener(key, this);
String rawConfig = dynamicConfiguration.getConfig(key);
if (!StringUtils.isEmpty(rawConfig)) {
process(new ConfigChangeEvent(key, rawConfig));
genConfiguratorsFromRawRule(rawConfig);
}
}

Expand All @@ -57,20 +57,28 @@ public void process(ConfigChangeEvent event) {
if (event.getChangeType().equals(ConfigChangeType.DELETED)) {
configurators.clear();
} else {
try {
// parseConfigurators will recognize app/service config automatically.
configurators = Configurator.toConfigurators(ConfigParser.parseConfigurators(event.getValue()))
.orElse(configurators);
} catch (Exception e) {
logger.error("Failed to parse raw dynamic config and it will not take effect, the raw config is: " +
event.getValue(), e);
if (!genConfiguratorsFromRawRule(event.getValue())) {
return;
}
}

notifyOverrides();
}

private boolean genConfiguratorsFromRawRule(String rawConfig) {
boolean parseSuccess = true;
try {
// parseConfigurators will recognize app/service config automatically.
configurators = Configurator.toConfigurators(ConfigParser.parseConfigurators(rawConfig))
.orElse(configurators);
} catch (Exception e) {
logger.error("Failed to parse raw dynamic config and it will not take effect, the raw config is: " +
rawConfig, e);
parseSuccess = false;
}
return parseSuccess;
}

protected abstract void notifyOverrides();

public List<Configurator> getConfigurators() {
Expand Down