diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java index 0cc6af29d8..b5feab080c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java @@ -17,7 +17,7 @@ package org.apache.dubbo.common.config.configcenter; 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.NamedThreadFactory; import org.apache.dubbo.common.utils.StringUtils; @@ -75,7 +75,7 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati /** * Logger */ - protected final Logger logger = LoggerFactory.getLogger(getClass()); + protected final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(getClass()); /** * The thread pool for workers who executes the tasks diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java index c96236f39d..05851fce04 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java @@ -52,6 +52,7 @@ public class DubboConfigDefaultPropertyValueBeanPostProcessor extends GenericBea */ public static final String BEAN_NAME = "dubboConfigDefaultPropertyValueBeanPostProcessor"; + @Override protected void processBeforeInitialization(AbstractConfig dubboConfigBean, String beanName) throws BeansException { // ignore auto generate bean name if (!beanName.contains("#")) { diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java index f0c77b5617..414182368e 100644 --- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java @@ -21,7 +21,7 @@ import org.apache.dubbo.common.config.configcenter.ConfigChangeType; 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.logger.Logger; +import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.StringUtils; @@ -61,7 +61,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE * Please see http://dubbo.apache.org/zh-cn/docs/user/configuration/config-center.html for details. */ public class ApolloDynamicConfiguration implements DynamicConfiguration { - private static final Logger logger = LoggerFactory.getLogger(ApolloDynamicConfiguration.class); + private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(ApolloDynamicConfiguration.class); 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"; @@ -106,7 +106,10 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration { throw new IllegalStateException("Failed to connect to config center, the config center is Apollo, " + "the address is: " + (StringUtils.isNotEmpty(configAddr) ? configAddr : configEnv)); } else { - logger.warn("Failed to connect to config center, the config center is Apollo, " + + // 5-1 Failed to connect to configuration center. + + logger.warn("5-1", "configuration server offline", "", + "Failed to connect to config center, the config center is Apollo, " + "the address is: " + (StringUtils.isNotEmpty(configAddr) ? configAddr : configEnv) + ", will use the local cache value instead before eventually the connection is established."); } diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java index b335184e18..508418e130 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java @@ -63,7 +63,16 @@ public class ZookeeperDynamicConfiguration extends TreePathDynamicConfiguration zkClient = zookeeperTransporter.connect(url); boolean isConnected = zkClient.isConnected(); if (!isConnected) { - throw new IllegalStateException("Failed to connect with zookeeper, pls check if url " + url + " is correct."); + + IllegalStateException illegalStateException = + new IllegalStateException("Failed to connect with zookeeper, pls check if url " + url + " is correct."); + + if (logger != null) { + logger.error("5-1", "configuration server offline", "", + "Failed to connect with zookeeper", illegalStateException); + } + + throw illegalStateException; } } diff --git a/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java b/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java index e8a5bcc8a1..c8c99fc173 100644 --- a/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java +++ b/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java @@ -52,8 +52,8 @@ import static org.apache.dubbo.metadata.MetadataConstants.META_DATA_STORE_TAG; */ public class RedisMetadataReport extends AbstractMetadataReport { - private final static String REDIS_DATABASE_KEY = "database"; - private final static Logger logger = LoggerFactory.getLogger(RedisMetadataReport.class); + private static final String REDIS_DATABASE_KEY = "database"; + private static final Logger logger = LoggerFactory.getLogger(RedisMetadataReport.class); // protected , for test protected JedisPool pool; @@ -66,7 +66,7 @@ public class RedisMetadataReport extends AbstractMetadataReport { super(url); timeout = url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT); if (url.getParameter(CLUSTER_KEY, false)) { - jedisClusterNodes = new HashSet(); + jedisClusterNodes = new HashSet<>(); List urls = url.getBackupUrls(); for (URL tmpUrl : urls) { jedisClusterNodes.add(new HostAndPort(tmpUrl.getHost(), tmpUrl.getPort())); @@ -103,7 +103,7 @@ public class RedisMetadataReport extends AbstractMetadataReport { if (StringUtils.isEmpty(content)) { return Collections.emptyList(); } - return new ArrayList(Arrays.asList(URL.decode(content))); + return new ArrayList<>(Arrays.asList(URL.decode(content))); } @Override diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java index 9088cceffc..12d48f5427 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java @@ -19,7 +19,7 @@ package org.apache.dubbo.rpc.proxy.javassist; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.bytecode.Proxy; import org.apache.dubbo.common.bytecode.Wrapper; -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.rpc.Invoker; import org.apache.dubbo.rpc.proxy.AbstractProxyFactory; @@ -33,7 +33,7 @@ import java.util.Arrays; * JavassistRpcProxyFactory */ public class JavassistProxyFactory extends AbstractProxyFactory { - private final static Logger logger = LoggerFactory.getLogger(JavassistProxyFactory.class); + private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(JavassistProxyFactory.class); private final JdkProxyFactory jdkProxyFactory = new JdkProxyFactory(); @Override