From 26841dfc75e1455ce5d42157b316729900149596 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 24 Mar 2017 17:00:52 +0800 Subject: [PATCH 1/2] Fix startup issue. --- .../skywalking/api/boot/ServiceManager.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java index ea5af0fe6..ed1693512 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java @@ -21,6 +21,7 @@ public enum ServiceManager { public void boot() { bootedServices = loadAllServices(); + startup(); } private Map loadAllServices() { @@ -28,16 +29,21 @@ public enum ServiceManager { Iterator serviceIterator = load().iterator(); while (serviceIterator.hasNext()) { BootService bootService = serviceIterator.next(); - try { - bootService.bootUp(); - bootedServices.put(bootService.getClass(), bootService); - } catch (Throwable e) { - logger.error(e, "ServiceManager try to start [{}] fail.", bootService.getClass().getName()); - } + bootedServices.put(bootService.getClass(), bootService); } return bootedServices; } + private void startup() { + for (BootService service : bootedServices.values()) { + try { + service.bootUp(); + } catch (Throwable e) { + logger.error(e, "ServiceManager try to start [{}] fail.", service.getClass().getName()); + } + } + } + /** * Find a {@link BootService} implementation, which is already started. * From 53f3670f9fbaef376207da64227ae96abf8c9e66 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 24 Mar 2017 17:01:52 +0800 Subject: [PATCH 2/2] Adjust collector restful service name. --- .../a/eye/skywalking/collector/worker/segment/SegmentPost.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java index 79b9c873b..d466b1d24 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java @@ -128,7 +128,7 @@ public class SegmentPost extends AbstractPost { @Override public String servletPath() { - return "/segment"; + return "/segments"; } @Override