From 5351021c16d6e6c20aec498a8b5afc3b533d18e7 Mon Sep 17 00:00:00 2001 From: Ian Luo Date: Thu, 21 Feb 2019 11:06:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20issue=20#274:=20monitor=E7=9A=84clust?= =?UTF-8?q?er=E4=B8=80=E5=AE=9A=E6=98=AFfailsafe=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=94=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dubbo/monitor/dubbo/DubboMonitorFactory.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java index 1ac63e84fe0..04ae988a53d 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java @@ -26,6 +26,10 @@ import org.apache.dubbo.rpc.Protocol; import org.apache.dubbo.rpc.ProxyFactory; +import static org.apache.dubbo.common.Constants.CHECK_KEY; +import static org.apache.dubbo.common.Constants.PROTOCOL_KEY; +import static org.apache.dubbo.common.Constants.REFERENCE_FILTER_KEY; + /** * DefaultMonitorFactory */ @@ -45,21 +49,20 @@ public void setProxyFactory(ProxyFactory proxyFactory) { @Override protected Monitor createMonitor(URL url) { - url = url.setProtocol(url.getParameter(Constants.PROTOCOL_KEY, "dubbo")); + url = url.setProtocol(url.getParameter(PROTOCOL_KEY, "dubbo")); if (StringUtils.isEmpty(url.getPath())) { url = url.setPath(MonitorService.class.getName()); } - String filter = url.getParameter(Constants.REFERENCE_FILTER_KEY); + String filter = url.getParameter(REFERENCE_FILTER_KEY); if (StringUtils.isEmpty(filter)) { filter = ""; } else { filter = filter + ","; } - url = url.addParameters(Constants.CLUSTER_KEY, "failsafe", Constants.CHECK_KEY, String.valueOf(false), - Constants.REFERENCE_FILTER_KEY, filter + "-monitor"); + url = url.addParameters(CHECK_KEY, String.valueOf(false), REFERENCE_FILTER_KEY, filter + "-monitor"); Invoker monitorInvoker = protocol.refer(MonitorService.class, url); MonitorService monitorService = proxyFactory.getProxy(monitorInvoker); return new DubboMonitor(monitorInvoker, monitorService); } -} \ No newline at end of file +} From 1c2a39b5c8d2c00452a02eb1866bb17efe5dc9f1 Mon Sep 17 00:00:00 2001 From: Ian Luo Date: Fri, 22 Feb 2019 10:32:17 +0800 Subject: [PATCH 2/2] remove unused import --- .../java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java index 04ae988a53d..9d8e70f3f5c 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.monitor.dubbo; -import org.apache.dubbo.common.Constants; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.monitor.Monitor;