This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new 6597a24cc3 Adding error code and replacing logger implementation of
multiple classes in registry module. (#10347)
6597a24cc3 is described below
commit 6597a24cc3022af29279142d3af75ce925697184
Author: Andy Cheung <[email protected]>
AuthorDate: Fri Jul 22 17:11:57 2022 +0800
Adding error code and replacing logger implementation of multiple classes
in registry module. (#10347)
* Replace all logger implementation in dubbo-registry-api module.
* Replace all logger implementation in all 'registry' modules.
* Adding error code in RegistryDirectory.
---
.../dubbo/registry/ListenerRegistryWrapper.java | 4 +-
.../apache/dubbo/registry/RegistryNotifier.java | 4 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 4 +-
.../listener/ServiceInstancesChangedListener.java | 4 +-
.../ServiceInstanceHostPortCustomizer.java | 4 +-
.../metadata/ServiceInstanceMetadataUtils.java | 4 +-
.../DefaultMigrationAddressComparator.java | 4 +-
.../client/migration/MigrationRuleHandler.java | 4 +-
.../client/migration/MigrationRuleListener.java | 4 +-
.../ServiceDiscoveryMigrationInvoker.java | 4 +-
.../registry/integration/RegistryDirectory.java | 58 ++++++++++++++++++----
.../registry/multicast/MulticastRegistry.java | 4 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 4 +-
.../nacos/util/NacosNamingServiceUtils.java | 4 +-
.../registry/zookeeper/ZookeeperRegistry.java | 4 +-
.../zookeeper/util/CuratorFrameworkUtils.java | 4 +-
16 files changed, 79 insertions(+), 39 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/ListenerRegistryWrapper.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/ListenerRegistryWrapper.java
index 37623879ca..c2300755df 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/ListenerRegistryWrapper.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/ListenerRegistryWrapper.java
@@ -18,7 +18,7 @@
package org.apache.dubbo.registry;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.UrlUtils;
@@ -26,7 +26,7 @@ import org.apache.dubbo.common.utils.UrlUtils;
import java.util.List;
public class ListenerRegistryWrapper implements Registry {
- private static final Logger logger =
LoggerFactory.getLogger(ListenerRegistryWrapper.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(ListenerRegistryWrapper.class);
private final Registry registry;
private final List<RegistryServiceListener> listeners;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
index 1714ae5828..452f919a03 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
@@ -30,7 +30,7 @@ import static
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_DELAY_EX
public abstract class RegistryNotifier {
- private static final Logger logger =
LoggerFactory.getLogger(RegistryNotifier.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(RegistryNotifier.class);
private volatile long lastExecuteTime;
private volatile long lastEventTime;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
index 668a6195da..30daeb7a1c 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.CollectionUtils;
@@ -69,7 +69,7 @@ import static
org.apache.dubbo.registry.Constants.CONFIGURATORS_SUFFIX;
import static org.apache.dubbo.rpc.model.ScopeModelUtil.getModuleModel;
public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
- private static final Logger logger =
LoggerFactory.getLogger(ServiceDiscoveryRegistryDirectory.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(ServiceDiscoveryRegistryDirectory.class);
/**
* instance address to invoker mapping.
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
index c54b4601ea..6ecfaef142 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
@@ -20,7 +20,7 @@ import org.apache.dubbo.common.ProtocolServiceKey;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.common.constants.CommonConstants;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.CollectionUtils;
@@ -67,7 +67,7 @@ import static
org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
*/
public class ServiceInstancesChangedListener {
- private static final Logger logger =
LoggerFactory.getLogger(ServiceInstancesChangedListener.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(ServiceInstancesChangedListener.class);
protected final Set<String> serviceNames;
protected final ServiceDiscovery serviceDiscovery;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceHostPortCustomizer.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceHostPortCustomizer.java
index 3611a6250a..b5e24bec8c 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceHostPortCustomizer.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceHostPortCustomizer.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.client.metadata;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.metadata.MetadataInfo;
@@ -35,7 +35,7 @@ import java.util.SortedSet;
* The {@link ServiceInstanceCustomizer} to customize the {@link
ServiceInstance#getPort() port} of service instance.
*/
public class ServiceInstanceHostPortCustomizer implements
ServiceInstanceCustomizer {
- private static final Logger logger =
LoggerFactory.getLogger(ServiceInstanceHostPortCustomizer.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(ServiceInstanceHostPortCustomizer.class);
@Override
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
index 918e7d3303..080344574f 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.registry.client.metadata;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.JsonUtils;
import org.apache.dubbo.common.utils.StringUtils;
@@ -58,7 +58,7 @@ import static org.apache.dubbo.rpc.Constants.DEPRECATED_KEY;
* @since 2.7.5
*/
public class ServiceInstanceMetadataUtils {
- private static final Logger LOGGER =
LoggerFactory.getLogger(ServiceInstanceMetadataUtils.class);
+ private static final ErrorTypeAwareLogger LOGGER =
LoggerFactory.getErrorTypeAwareLogger(ServiceInstanceMetadataUtils.class);
/**
* The prefix of {@link MetadataService} : "dubbo.metadata-service."
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
index 331053f2fb..0c3d90a827 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.client.migration;
import org.apache.dubbo.common.config.ConfigurationUtils;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.StringUtils;
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class DefaultMigrationAddressComparator implements
MigrationAddressComparator {
- private static final Logger logger =
LoggerFactory.getLogger(DefaultMigrationAddressComparator.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(DefaultMigrationAddressComparator.class);
private static final String MIGRATION_THRESHOLD =
"dubbo.application.migration.threshold";
private static final String DEFAULT_THRESHOLD_STRING = "0.0";
private static final float DEFAULT_THREAD = 0f;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
index 6d99dae252..6ce0f270e5 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.client.migration;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.status.reporter.FrameworkStatusReportService;
import org.apache.dubbo.registry.client.migration.model.MigrationRule;
@@ -25,7 +25,7 @@ import
org.apache.dubbo.registry.client.migration.model.MigrationStep;
public class MigrationRuleHandler<T> {
public static final String DUBBO_SERVICEDISCOVERY_MIGRATION =
"dubbo.application.migration.step";
- private static final Logger logger =
LoggerFactory.getLogger(MigrationRuleHandler.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(MigrationRuleHandler.class);
private MigrationClusterInvoker<T> migrationInvoker;
private MigrationStep currentStep;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
index c7cbb0363c..9623e8ae7e 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
@@ -22,7 +22,7 @@ import
org.apache.dubbo.common.config.configcenter.ConfigChangedEvent;
import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.common.extension.Activate;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.CollectionUtils;
@@ -63,7 +63,7 @@ import static
org.apache.dubbo.common.constants.RegistryConstants.INIT;
*/
@Activate
public class MigrationRuleListener implements RegistryProtocolListener,
ConfigurationListener {
- private static final Logger logger =
LoggerFactory.getLogger(MigrationRuleListener.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(MigrationRuleListener.class);
private static final String DUBBO_SERVICEDISCOVERY_MIGRATION =
"DUBBO_SERVICEDISCOVERY_MIGRATION";
private static final String MIGRATION_DELAY_KEY =
"dubbo.application.migration.delay";
private static final int MIGRATION_DEFAULT_DELAY_TIME = 60000;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/ServiceDiscoveryMigrationInvoker.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/ServiceDiscoveryMigrationInvoker.java
index 572aa22d93..b48c79cd22 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/ServiceDiscoveryMigrationInvoker.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/ServiceDiscoveryMigrationInvoker.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.client.migration;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.client.migration.model.MigrationRule;
@@ -31,7 +31,7 @@ import org.apache.dubbo.rpc.cluster.ClusterInvoker;
import java.util.concurrent.CountDownLatch;
public class ServiceDiscoveryMigrationInvoker<T> extends MigrationInvoker<T> {
- private static final Logger logger =
LoggerFactory.getLogger(ServiceDiscoveryMigrationInvoker.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(ServiceDiscoveryMigrationInvoker.class);
public ServiceDiscoveryMigrationInvoker(RegistryProtocol registryProtocol,
Cluster cluster, Registry registry, Class<T> type, URL url, URL consumerUrl) {
super(registryProtocol, cluster, registry, type, url, consumerUrl);
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index c8a8d1ebd4..e3573ded9f 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -34,6 +34,7 @@ import org.apache.dubbo.registry.AddressListener;
import org.apache.dubbo.remoting.Constants;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
+import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.cluster.Configurator;
import org.apache.dubbo.rpc.cluster.Router;
import org.apache.dubbo.rpc.cluster.directory.StaticDirectory;
@@ -224,8 +225,13 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
// use local reference to avoid NPE as this.cachedInvokerUrls will
be set null by destroyAllInvokers().
Set<URL> localCachedInvokerUrls = this.cachedInvokerUrls;
if (invokerUrls.isEmpty() && localCachedInvokerUrls != null) {
- logger.warn("Service" + serviceKey + " received empty address
list with no EMPTY protocol set, trigger empty protection.");
+
+ // 1-4 Empty address.
+ logger.warn("1-4", "configuration ", "",
+ "Service" + serviceKey + " received empty address list
with no EMPTY protocol set, trigger empty protection.");
+
invokerUrls.addAll(localCachedInvokerUrls);
+
} else {
localCachedInvokerUrls = new HashSet<>();
localCachedInvokerUrls.addAll(invokerUrls);//Cached invoker
urls, convenient for comparison
@@ -255,8 +261,16 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
*
*/
if (CollectionUtils.isEmptyMap(newUrlInvokerMap)) {
- logger.error(new IllegalStateException("urls to invokers error
.invokerUrls.size :" + invokerUrls.size() + ", invoker.size :0. urls :" +
invokerUrls
- .toString()));
+
+ // 3-1 - Failed to convert the URL address into Invokers.
+
+ logger.error(
+ "3-1", "inconsistency between the client protocol and the
protocol of the server",
+ "", "urls to invokers error",
+ new IllegalStateException(
+ "urls to invokers error. invokerUrls.size :" +
+ invokerUrls.size() + ", invoker.size :0. urls :" +
invokerUrls.toString()));
+
return;
}
@@ -333,7 +347,7 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
}
/**
- * Turn urls into invokers, and if url has been refer, will not
re-reference.
+ * Turn urls into invokers, and if url has been referred, will not
re-reference.
* the items that will be put into newUrlInvokeMap will be removed from
oldUrlInvokerMap.
*
* @param oldUrlInvokerMap it might be modified during the process.
@@ -361,19 +375,28 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
continue;
}
}
+
if (EMPTY_PROTOCOL.equals(providerUrl.getProtocol())) {
continue;
}
+
if
(!getUrl().getOrDefaultFrameworkModel().getExtensionLoader(Protocol.class).hasExtension(providerUrl.getProtocol()))
{
- logger.error(new IllegalStateException("Unsupported protocol "
+ providerUrl.getProtocol() +
+
+ // 4-1 - Unsupported protocol
+
+ logger.error("4-1", "typo in URL", "", "Unsupported protocol.",
+ new IllegalStateException("Unsupported protocol " +
providerUrl.getProtocol() +
" in notified url: " + providerUrl + " from registry " +
getUrl().getAddress() +
" to consumer " + NetUtils.getLocalHost() + ", supported
protocol: " +
getUrl().getOrDefaultFrameworkModel().getExtensionLoader(Protocol.class).getSupportedExtensions()));
+
continue;
}
URL url = mergeUrl(providerUrl);
- // Cache key is url that does not merge with consumer side
parameters, regardless of how the consumer combines parameters, if the server
url changes, then refer again
+ // Cache key is url that does not merge with consumer side
parameters,
+ // regardless of how the consumer combines parameters,
+ // if the server url changes, then refer again
Invoker<T> invoker = oldUrlInvokerMap == null ? null :
oldUrlInvokerMap.remove(url);
if (invoker == null) { // Not in the cache, refer again
try {
@@ -387,7 +410,18 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
invoker = protocol.refer(serviceType, url);
}
} catch (Throwable t) {
- logger.error("Failed to refer invoker for interface:" +
serviceType + ",url:(" + url + ")" + t.getMessage(), t);
+
+ // Thrown by AbstractProtocol.optimizeSerialization()
+ if (t instanceof RpcException &&
t.getMessage().contains("serialization optimizer")) {
+ // 4-2 - serialization optimizer class initialization
failed.
+ logger.error("4-2", "typo in optimizer class", "",
+ "Failed to refer invoker for interface:" +
serviceType + ",url:(" + url + ")" + t.getMessage(), t);
+
+ } else {
+ // 4-3 - Failed to refer invoker by other reason.
+ logger.error("4-3", "", "",
+ "Failed to refer invoker for interface:" +
serviceType + ",url:(" + url + ")" + t.getMessage(), t);
+ }
}
if (invoker != null) { // Put new invoker in cache
newUrlInvokerMap.put(url, invoker);
@@ -494,7 +528,9 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
try {
invoker.destroyAll();
} catch (Throwable t) {
- logger.warn("Failed to destroy service " + serviceKey + "
to provider " + invoker.getUrl(), t);
+ // 1-15 - Failed to destroy service
+ logger.warn("1-15", "", "",
+ "Failed to destroy service " + serviceKey + " to
provider " + invoker.getUrl(), t);
}
}
localUrlInvokerMap.clear();
@@ -547,8 +583,12 @@ public class RegistryDirectory<T> extends
DynamicDirectory<T> {
APP_DYNAMIC_CONFIGURATORS_CATEGORY.equals(category)) {
return true;
}
- logger.warn("Unsupported category " + category + " in notified url: "
+ url + " from registry " +
+
+ // 1-16 - Unsupported category in NotifyListener
+ logger.warn("1-16", "", "",
+ "Unsupported category " + category + " in notified url: " + url +
" from registry " +
getUrl().getAddress() + " to consumer " + NetUtils.getLocalHost());
+
return false;
}
diff --git
a/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
index f9679153e1..48b3f668a7 100644
---
a/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
+++
b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.multicast;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
@@ -71,7 +71,7 @@ import static org.apache.dubbo.registry.Constants.UNSUBSCRIBE;
public class MulticastRegistry extends FailbackRegistry {
// logging output
- private static final Logger logger =
LoggerFactory.getLogger(MulticastRegistry.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(MulticastRegistry.class);
private static final int DEFAULT_MULTICAST_PORT = 1234;
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index f0ccdbe9d6..0a3f906b37 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.registry.nacos;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.url.component.DubboServiceAddressURL;
import org.apache.dubbo.common.url.component.ServiceConfigURL;
@@ -127,7 +127,7 @@ public class NacosRegistry extends FailbackRegistry {
* The interval in second of lookup Nacos service names(only for Dubbo-OPS)
*/
private static final long LOOKUP_INTERVAL =
Long.getLong("nacos.service.names.lookup.interval", 30);
- private static final Logger logger =
LoggerFactory.getLogger(NacosRegistry.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(NacosRegistry.class);
private final NacosNamingServiceWrapper namingService;
/**
* {@link ScheduledExecutorService} lookup Nacos service names(only for
Dubbo-OPS)
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
index 857c422817..6771bf0e64 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.nacos.util;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
@@ -52,7 +52,7 @@ import static
org.apache.dubbo.common.utils.StringConstantFieldValuePredicate.of
*/
public class NacosNamingServiceUtils {
- private static final Logger logger =
LoggerFactory.getLogger(NacosNamingServiceUtils.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(NacosNamingServiceUtils.class);
private static final String NACOS_GROUP_KEY = "nacos.group";
/**
diff --git
a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
index 9bba269685..c885dc7040 100644
---
a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
+++
b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.zookeeper;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
@@ -56,7 +56,7 @@ import static
org.apache.dubbo.common.constants.RegistryConstants.ROUTERS_CATEGO
*/
public class ZookeeperRegistry extends CacheableFailbackRegistry {
- private static final Logger logger =
LoggerFactory.getLogger(ZookeeperRegistry.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(ZookeeperRegistry.class);
private static final String DEFAULT_ROOT = "dubbo";
diff --git
a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
index 9aee1b5bce..23a82d93b3 100644
---
a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
+++
b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.registry.zookeeper.util;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceInstance;
@@ -155,7 +155,7 @@ public abstract class CuratorFrameworkUtils {
}
private static class CuratorConnectionStateListener implements
ConnectionStateListener {
- private static final Logger logger =
LoggerFactory.getLogger(CuratorConnectionStateListener.class);
+ private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(CuratorConnectionStateListener.class);
private final long UNKNOWN_SESSION_ID = -1L;
protected final int DEFAULT_CONNECTION_TIMEOUT_MS = 30 * 1000;
protected final int DEFAULT_SESSION_TIMEOUT_MS = 60 * 1000;
