Repository: camel Updated Branches: refs/heads/master 6f3e8d29d -> 622a71d67
CAMEL-9795: camel-zipkin - Make sure to start the event notifier Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4476051 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4476051 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4476051 Branch: refs/heads/master Commit: b4476051d711aebe249ce57e0d42a8ef8ef5baf8 Parents: 270976c Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Apr 21 16:08:54 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 21 16:09:06 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/zipkin/ZipkinTracer.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b4476051/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java ---------------------------------------------------------------------- diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java index 05916f1..0237d26 100644 --- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java +++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java @@ -341,20 +341,23 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory, createBraveForService(pattern, serviceName); } - ServiceHelper.startService(spanCollector); + ServiceHelper.startServices(spanCollector, eventNotifier); } @Override protected void doStop() throws Exception { + // stop event notifier + camelContext.getManagementStrategy().removeEventNotifier(eventNotifier); + ServiceHelper.stopService(eventNotifier); + // stop and close collector ServiceHelper.stopAndShutdownService(spanCollector); if (spanCollector instanceof Closeable) { IOHelper.close((Closeable) spanCollector); } - + // clear braves braves.clear(); - - camelContext.getManagementStrategy().removeEventNotifier(eventNotifier); + // remove route policy camelContext.getRoutePolicyFactories().remove(this); }
