Browse Source

fixed registeringManagement if mngmnt port is null

pull/15/head
Spencer Gibb 10 years ago
parent
commit
376065c41a
  1. 21
      src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java

21
src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java

@ -19,6 +19,7 @@ package org.springframework.cloud.client.discovery; @@ -19,6 +19,7 @@ package org.springframework.cloud.client.discovery;
import javax.annotation.PreDestroy;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.actuate.autoconfigure.ManagementServerProperties;
import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
import org.springframework.context.ApplicationContext;
@ -74,7 +75,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, @@ -74,7 +75,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
}
register();
if (ManagementServerPortUtils.isDifferent(this.context)) {
if (shouldRegisterManagement()) {
registerManagement();
}
this.context
@ -82,6 +83,12 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, @@ -82,6 +83,12 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
this.running = true;
}
protected boolean shouldRegisterManagement() {
return getManagementServerProperties() != null
&& getManagementPort() != null
&& ManagementServerPortUtils.isDifferent(this.context);
}
protected abstract Object getConfiguration();
protected abstract void register();
@ -107,7 +114,15 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, @@ -107,7 +114,15 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
}
protected Integer getManagementPort() {
return this.context.getBean(ManagementServerProperties.class).getPort();
return getManagementServerProperties().getPort();
}
private ManagementServerProperties getManagementServerProperties() {
try {
return this.context.getBean(ManagementServerProperties.class);
} catch (NoSuchBeanDefinitionException e) {
return null;
}
}
protected String getAppName() {
@ -118,7 +133,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, @@ -118,7 +133,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
public void stop() {
if (isEnabled()) {
deregister();
if (getManagementPort() != null) {
if (shouldRegisterManagement()) {
deregisterManagement();
}
}

Loading…
Cancel
Save