From 769e6df67e94e6e2c57c13fbcf84fce21f6aeccd Mon Sep 17 00:00:00 2001 From: He Yiding Date: Thu, 16 Jul 2020 14:10:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jd/platform/hotkey/client/ClientStarter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/com/jd/platform/hotkey/client/ClientStarter.java b/client/src/main/java/com/jd/platform/hotkey/client/ClientStarter.java index 1102d8a..09f14c2 100644 --- a/client/src/main/java/com/jd/platform/hotkey/client/ClientStarter.java +++ b/client/src/main/java/com/jd/platform/hotkey/client/ClientStarter.java @@ -102,14 +102,14 @@ public class ClientStarter { //开启worker重连器 WorkerRetryConnector.retryConnectWorkers(); - registEventBus(); + registerEventBus(); EtcdStarter starter = new EtcdStarter(); //与etcd相关的监听都开启 starter.start(); } - private void registEventBus() { + private void registerEventBus() { //netty连接器会关注WorkerInfoChangeEvent事件 EventBusCenter.register(new WorkerChangeSubscriber()); //热key探测回调关注热key事件 -- Gitee From 071a5a389d2f8c9a3cddaba8f8f7ee10acb0789f Mon Sep 17 00:00:00 2001 From: He Yiding Date: Thu, 16 Jul 2020 14:16:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=96=B9=E6=B3=95=E5=87=BA=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jd/platform/hotkey/client/etcd/EtcdStarter.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java b/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java index ee7d07b..3f69309 100644 --- a/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java +++ b/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java @@ -19,7 +19,6 @@ import com.jd.platform.hotkey.common.rule.KeyRule; import com.jd.platform.hotkey.common.tool.FastJsonUtils; import io.grpc.StatusRuntimeException; import io.netty.util.internal.StringUtil; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -251,15 +250,13 @@ public class EtcdStarter { IConfigCenter configCenter = EtcdConfigFactory.configCenter(); try { List ruleList = new ArrayList<>(); - //从etcd获取自己的rule String rules = configCenter.get(ConfigConstant.rulePath + Context.APP_NAME); + if (StringUtil.isNullOrEmpty(rules)) { JdLogger.warn(getClass(), "rule is empty"); - //会清空本地缓存队列 - notifyRuleChange(ruleList); - return true; + } else { + ruleList = FastJsonUtils.toList(rules, KeyRule.class); } - ruleList = FastJsonUtils.toList(rules, KeyRule.class); notifyRuleChange(ruleList); return true; -- Gitee From 7dd250e389442e252bb65ee14c631474ebb8e6d6 Mon Sep 17 00:00:00 2001 From: He Yiding Date: Thu, 16 Jul 2020 14:21:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?EtcdStarter=20=E9=81=87=E5=88=B0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=97=B6=E6=9B=B4=E5=AE=8C=E6=95=B4=E7=9A=84=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotkey/client/etcd/EtcdStarter.java | 16 ++++++-------- .../hotkey/client/log/DefaultLogger.java | 22 ++++++++++++------- .../hotkey/client/log/HotKeyLogger.java | 9 +++++--- .../platform/hotkey/client/log/JdLogger.java | 20 ++++++++++------- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java b/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java index 3f69309..4ff90c5 100644 --- a/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java +++ b/client/src/main/java/com/jd/platform/hotkey/client/etcd/EtcdStarter.java @@ -76,7 +76,7 @@ public class EtcdStarter { } } catch (StatusRuntimeException ex) { //etcd连不上 - JdLogger.error(getClass(), "etcd connected fail. Check the etcd address!!!"); + JdLogger.error(getClass(), "etcd connected fail. Check the etcd address!!!", ex); } } @@ -168,7 +168,7 @@ public class EtcdStarter { notifyWorkerChange(addresses); } catch (StatusRuntimeException ex) { //etcd连不上 - JdLogger.error(getClass(), "etcd connected fail. Check the etcd address!!!"); + JdLogger.error(getClass(), "etcd connected fail. Check the etcd address!!!", ex); } } @@ -222,12 +222,12 @@ public class EtcdStarter { EventBusCenter.getInstance().post(new ReceiveNewKeyEvent(model)); } } catch (Exception e) { - JdLogger.error(getClass(), "new key err ：" + keyValue); + JdLogger.error(getClass(), "new key err ：" + keyValue, e); } } } catch (Exception e) { - JdLogger.error(getClass(), "watch err"); + JdLogger.error(getClass(), "watch err", e); } }); @@ -262,10 +262,10 @@ public class EtcdStarter { return true; } catch (StatusRuntimeException ex) { //etcd连不上 - JdLogger.error(getClass(), "etcd connected fail. Check the etcd address!!!"); + JdLogger.error(getClass(), "etcd connected fail. Check the etcd address!!!", ex); return false; } catch (Exception e) { - JdLogger.error(getClass(), "fetch rule failure, please check the rule info in etcd"); + JdLogger.error(getClass(), "fetch rule failure, please check the rule info in etcd", e); return true; } @@ -291,10 +291,8 @@ public class EtcdStarter { fetchRuleFromEtcd(); } } catch (Exception e) { - JdLogger.error(getClass(), "watch err"); + JdLogger.error(getClass(), "watch err", e); } - - }); } diff --git a/client/src/main/java/com/jd/platform/hotkey/client/log/DefaultLogger.java b/client/src/main/java/com/jd/platform/hotkey/client/log/DefaultLogger.java index e3465e5..bd48be8 100644 --- a/client/src/main/java/com/jd/platform/hotkey/client/log/DefaultLogger.java +++ b/client/src/main/java/com/jd/platform/hotkey/client/log/DefaultLogger.java @@ -8,23 +8,29 @@ import org.slf4j.LoggerFactory; * @date 2020-04-21 */ public class DefaultLogger implements HotKeyLogger { + + @Override + public void debug(Class loggerClass, String info) { + LoggerFactory.getLogger(loggerClass).debug(info); + } + @Override - public void debug(Class className, String info) { - LoggerFactory.getLogger(className).debug(info); + public void info(Class loggerClass, String info) { + LoggerFactory.getLogger(loggerClass).info(info); } @Override - public void info(Class className, String info) { - LoggerFactory.getLogger(className).info(info); + public void warn(Class loggerClass, String info) { + LoggerFactory.getLogger(loggerClass).warn(info); } @Override - public void error(Class className, String info) { - LoggerFactory.getLogger(className).error(info); + public void error(Class loggerClass, String info) { + LoggerFactory.getLogger(loggerClass).error(info); } @Override - public void warn(Class className, String info) { - LoggerFactory.getLogger(className).warn(info); + public void error(Class loggerClass, String message, Throwable cause) { + LoggerFactory.getLogger(loggerClass).error(message, cause); } } diff --git a/client/src/main/java/com/jd/platform/hotkey/client/log/HotKeyLogger.java b/client/src/main/java/com/jd/platform/hotkey/client/log/HotKeyLogger.java index 39c0c41..eab344f 100644 --- a/client/src/main/java/com/jd/platform/hotkey/client/log/HotKeyLogger.java +++ b/client/src/main/java/com/jd/platform/hotkey/client/log/HotKeyLogger.java @@ -6,11 +6,14 @@ package com.jd.platform.hotkey.client.log; * @date 2020-04-21 */ public interface HotKeyLogger { - void debug(Class className, String info); - void info(Class className, String info); + void debug(Class loggerClass, String info); + + void info(Class loggerClass, String info); + + void warn(Class loggerClass, String info); void error(Class className, String info); - void warn(Class className, String info); + void error(Class loggerClass, String message, Throwable cause); } diff --git a/client/src/main/java/com/jd/platform/hotkey/client/log/JdLogger.java b/client/src/main/java/com/jd/platform/hotkey/client/log/JdLogger.java index 4db5358..97e3362 100644 --- a/client/src/main/java/com/jd/platform/hotkey/client/log/JdLogger.java +++ b/client/src/main/java/com/jd/platform/hotkey/client/log/JdLogger.java @@ -5,6 +5,7 @@ package com.jd.platform.hotkey.client.log; * @version 1.0 */ public class JdLogger { + private static HotKeyLogger logger = new DefaultLogger(); public static void setLogger(HotKeyLogger log) { @@ -13,20 +14,23 @@ public class JdLogger { } } - public static void debug(Class className, String info) { - logger.debug(className, info); + public static void debug(Class loggerClass, String info) { + logger.debug(loggerClass, info); } - public static void info(Class className, String info) { - logger.info(className, info); + public static void info(Class loggerClass, String info) { + logger.info(loggerClass, info); } - public static void warn(Class className, String info) { - logger.warn(className, info); + public static void warn(Class loggerClass, String info) { + logger.warn(loggerClass, info); } - public static void error(Class className, String info) { - logger.error(className, info); + public static void error(Class loggerClass, String info) { + logger.error(loggerClass, info); } + public static void error(Class loggerClass, String message, Throwable cause) { + logger.error(loggerClass, message, cause); + } } -- Gitee