You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/11/18 12:09:15 UTC
[dubbo] branch 3.0 updated: [3.0] revert AbstractConfiguratorListener#genConfiguratorsFromRawRule (#9248)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 9f8ee68 [3.0] revert AbstractConfiguratorListener#genConfiguratorsFromRawRule (#9248)
9f8ee68 is described below
commit 9f8ee683f54924b5ddc14cebd7bd645605df5c20
Author: zrlw <zr...@sina.com>
AuthorDate: Thu Nov 18 20:08:32 2021 +0800
[3.0] revert AbstractConfiguratorListener#genConfiguratorsFromRawRule (#9248)
* ignore event content parse failure
* support single ip
* revert genConfiguratorsFromRawRule
---
.../integration/AbstractConfiguratorListener.java | 27 +++++++++++-----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
index a818984..074dc1c 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
@@ -89,11 +89,10 @@ public abstract class AbstractConfiguratorListener implements ConfigurationListe
", raw config content is:\n " + event.getContent());
}
- if (event.getChangeType().equals(ConfigChangeType.ADDED)) {
- return;
- } else if (event.getChangeType().equals(ConfigChangeType.DELETED)) {
+ if (event.getChangeType().equals(ConfigChangeType.DELETED)) {
configurators.clear();
} else {
+ // ADDED or MODIFIED
if (!genConfiguratorsFromRawRule(event.getContent())) {
return;
}
@@ -103,21 +102,21 @@ public abstract class AbstractConfiguratorListener implements ConfigurationListe
}
private boolean genConfiguratorsFromRawRule(String rawConfig) {
- boolean parseSuccess = true;
+ List<URL> urls;
try {
// parseConfigurators will recognize app/service config automatically.
- List<URL> urls = ConfigParser.parseConfigurators(rawConfig);
- List<URL> safeUrls = urls.stream()
- .map(url -> url.removeParameters(securityKey))
- .map(url -> url.setScopeModel(moduleModel))
- .collect(Collectors.toList());
- configurators = Configurator.toConfigurators(safeUrls).orElse(configurators);
+ urls = ConfigParser.parseConfigurators(rawConfig);
} 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;
+ logger.warn("Failed to parse raw dynamic config and it will not take effect, the raw config is: "
+ + rawConfig + ", cause: " + e.getMessage());
+ return false;
}
- return parseSuccess;
+ List<URL> safeUrls = urls.stream()
+ .map(url -> url.removeParameters(securityKey))
+ .map(url -> url.setScopeModel(moduleModel))
+ .collect(Collectors.toList());
+ configurators = Configurator.toConfigurators(safeUrls).orElse(configurators);
+ return true;
}
protected abstract void notifyOverrides();