diff --git a/dz3r-director/src/main/java/net/sf/dz3r/model/UnitDirector.java b/dz3r-director/src/main/java/net/sf/dz3r/model/UnitDirector.java index ce5eceda4..1f623e9a1 100644 --- a/dz3r-director/src/main/java/net/sf/dz3r/model/UnitDirector.java +++ b/dz3r-director/src/main/java/net/sf/dz3r/model/UnitDirector.java @@ -91,16 +91,19 @@ public UnitDirector( Optional.ofNullable(metricsCollectorSet) .ifPresent(collectors -> Flux.fromIterable(collectors) + .publishOn(Schedulers.boundedElastic()) .doOnNext(c -> c.connect(feed)) - .subscribeOn(Schedulers.boundedElastic()) + .doOnComplete(() -> logger.info("{}: connected metric collectors", getAddress())) .subscribe()); + Optional.ofNullable(connectorSet) .ifPresent(connectors -> Flux.fromIterable(connectors) + .publishOn(Schedulers.boundedElastic()) .doOnNext(c -> { c.connect(feed); // VT: FIXME: Connect the control input when the API signature is established }) - .subscribeOn(Schedulers.boundedElastic()) + .doOnComplete(() -> logger.info("{}: connected connectors", getAddress())) .subscribe()); logger.info("Configured: {} ({} zones: {})", diff --git a/dz3r-http-gae/src/main/java/net/sf/dz3r/view/http/gae/v3/HttpConnectorGAE.java b/dz3r-http-gae/src/main/java/net/sf/dz3r/view/http/gae/v3/HttpConnectorGAE.java index c68f5eeee..3b36c7f29 100644 --- a/dz3r-http-gae/src/main/java/net/sf/dz3r/view/http/gae/v3/HttpConnectorGAE.java +++ b/dz3r-http-gae/src/main/java/net/sf/dz3r/view/http/gae/v3/HttpConnectorGAE.java @@ -97,7 +97,6 @@ public void connect(UnitDirector.Feed feed) { ); zoneStatusSubscription = zoneStatusFeed - .publishOn(Schedulers.boundedElastic()) .buffer(pollInterval) .doOnNext(this::exchange) .subscribe();