From d61f65cef84cad0ada34e8744c1d1d5a8e311cf0 Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Fri, 25 Apr 2014 11:31:43 +0800 Subject: [PATCH] update mbean to mxbean #98 --- .../us/codecraft/webmagic/monitor/SpiderMonitor.java | 11 ++++++----- .../us/codecraft/webmagic/monitor/SpiderStatus.java | 2 +- ...SpiderStatusMBean.java => SpiderStatusMXBean.java} | 2 +- .../webmagic/monitor/CustomSpiderStatus.java | 2 +- ...StatusMBean.java => CustomSpiderStatusMXBean.java} | 2 +- .../codecraft/webmagic/monitor/SpiderMonitorTest.java | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) rename webmagic-core/src/main/java/us/codecraft/webmagic/monitor/{SpiderStatusMBean.java => SpiderStatusMXBean.java} (92%) rename webmagic-core/src/test/java/us/codecraft/webmagic/monitor/{CustomSpiderStatusMBean.java => CustomSpiderStatusMXBean.java} (63%) diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java b/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java index d4243c1c..4a02db11 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java @@ -40,13 +40,13 @@ public class SpiderMonitor { private Type type = Type.Local; - private List spiderStatuses = new ArrayList(); + private List spiderStatuses = new ArrayList(); - public List getSpiders() { + public List getSpiders() { return spiderStatuses; } - public SpiderStatusMBean getSpider() { + public SpiderStatusMXBean getSpider() { return spiderStatuses.get(0); } @@ -70,7 +70,7 @@ public class SpiderMonitor { return this; } - protected SpiderStatusMBean getSpiderStatusMBean(Spider spider, MonitorSpiderListener monitorSpiderListener) { + protected SpiderStatusMXBean getSpiderStatusMBean(Spider spider, MonitorSpiderListener monitorSpiderListener) { return new SpiderStatus(spider, monitorSpiderListener); } @@ -182,7 +182,7 @@ public class SpiderMonitor { jmxConnServer.start(); } - for (SpiderStatusMBean spiderStatus : spiderStatuses) { + for (SpiderStatusMXBean spiderStatus : spiderStatuses) { objName = new ObjectName(jmxServerName + ":name=" + spiderStatus.getName()); localServer.registerMBean(spiderStatus, objName); } @@ -199,6 +199,7 @@ public class SpiderMonitor { SpiderMonitor spiderMonitor = new SpiderMonitor(); spiderMonitor.register(oschinaSpider, githubSpider); + // spiderMonitor.jmxStart(); oschinaSpider.start(); githubSpider.start(); diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatus.java b/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatus.java index 6b49cbb2..889555cf 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatus.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatus.java @@ -10,7 +10,7 @@ import java.util.List; * @author code4crafer@gmail.com * @since 0.5.0 */ -public class SpiderStatus implements SpiderStatusMBean { +public class SpiderStatus implements SpiderStatusMXBean { protected final Spider spider; diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatusMBean.java b/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatusMXBean.java similarity index 92% rename from webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatusMBean.java rename to webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatusMXBean.java index 156b6532..cc0f0401 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatusMBean.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/monitor/SpiderStatusMXBean.java @@ -6,7 +6,7 @@ import java.util.List; * @author code4crafer@gmail.com * @since 0.5.0 */ -public interface SpiderStatusMBean { +public interface SpiderStatusMXBean { public String getName(); diff --git a/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatus.java b/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatus.java index a0b7f77d..75679daf 100644 --- a/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatus.java +++ b/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatus.java @@ -5,7 +5,7 @@ import us.codecraft.webmagic.Spider; /** * @author code4crafer@gmail.com */ -public class CustomSpiderStatus extends SpiderStatus implements CustomSpiderStatusMBean { +public class CustomSpiderStatus extends SpiderStatus implements CustomSpiderStatusMXBean { public CustomSpiderStatus(Spider spider, SpiderMonitor.MonitorSpiderListener monitorSpiderListener) { super(spider, monitorSpiderListener); diff --git a/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatusMBean.java b/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatusMXBean.java similarity index 63% rename from webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatusMBean.java rename to webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatusMXBean.java index 104b27d2..5dd8ace2 100644 --- a/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatusMBean.java +++ b/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/CustomSpiderStatusMXBean.java @@ -3,7 +3,7 @@ package us.codecraft.webmagic.monitor; /** * @author code4crafer@gmail.com */ -public interface CustomSpiderStatusMBean extends SpiderStatusMBean { +public interface CustomSpiderStatusMXBean extends SpiderStatusMXBean { public String getSchedulerName(); diff --git a/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/SpiderMonitorTest.java b/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/SpiderMonitorTest.java index 450f3fe1..d1065f9a 100644 --- a/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/SpiderMonitorTest.java +++ b/webmagic-core/src/test/java/us/codecraft/webmagic/monitor/SpiderMonitorTest.java @@ -15,7 +15,7 @@ public class SpiderMonitorTest { public void testInherit() throws Exception { SpiderMonitor spiderMonitor = new SpiderMonitor(){ @Override - protected SpiderStatusMBean getSpiderStatusMBean(Spider spider, MonitorSpiderListener monitorSpiderListener) { + protected SpiderStatusMXBean getSpiderStatusMBean(Spider spider, MonitorSpiderListener monitorSpiderListener) { return new CustomSpiderStatus(spider, monitorSpiderListener); } };