Commit a63b8256 by Dave Syer

Add call to Lifecycle.stop()

See gh-377
parent ce96c834
...@@ -137,7 +137,7 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order ...@@ -137,7 +137,7 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order
if (this.healthCheckHandler != null) { if (this.healthCheckHandler != null) {
DiscoveryManager.getInstance().getDiscoveryClient() DiscoveryManager.getInstance().getDiscoveryClient()
.registerHealthCheck(this.healthCheckHandler); .registerHealthCheck(this.healthCheckHandler);
} }
this.context.publishEvent(new InstanceRegisteredEvent<>(this, this.context.publishEvent(new InstanceRegisteredEvent<>(this,
this.instanceConfig)); this.instanceConfig));
...@@ -173,6 +173,7 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order ...@@ -173,6 +173,7 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order
@Override @Override
public void stop(Runnable callback) { public void stop(Runnable callback) {
stop();
callback.run(); callback.run();
} }
...@@ -223,15 +224,15 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order ...@@ -223,15 +224,15 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order
@ConditionalOnClass(Endpoint.class) @ConditionalOnClass(Endpoint.class)
@ConditionalOnBean(MetricReader.class) @ConditionalOnBean(MetricReader.class)
protected static class EurekaHealthIndicatorConfiguration { protected static class EurekaHealthIndicatorConfiguration {
@Autowired @Autowired
private List<MetricReader> metricReaders = Collections.emptyList(); private List<MetricReader> metricReaders = Collections.emptyList();
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public EurekaHealthIndicator eurekaHealthIndicator( public EurekaHealthIndicator eurekaHealthIndicator(
com.netflix.discovery.DiscoveryClient eurekaDiscoveryClient, EurekaInstanceConfig config) { com.netflix.discovery.DiscoveryClient eurekaDiscoveryClient, EurekaInstanceConfig config) {
CompositeMetricReader metrics = new CompositeMetricReader(metricReaders.toArray(new MetricReader[0])); CompositeMetricReader metrics = new CompositeMetricReader(this.metricReaders.toArray(new MetricReader[0]));
return new EurekaHealthIndicator(eurekaDiscoveryClient, metrics, config); return new EurekaHealthIndicator(eurekaDiscoveryClient, metrics, config);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment