You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:46:17 UTC
[14/50] brooklyn-library git commit: remove sensor no longer used
remove sensor no longer used
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/f83a45b5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/f83a45b5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/f83a45b5
Branch: refs/heads/0.4.0
Commit: f83a45b5439ca966fb3bd1998ca1714e10496d86
Parents: 6127210
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Sep 28 00:19:47 2012 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 28 00:21:23 2012 -0400
----------------------------------------------------------------------
.../ControlledDynamicWebAppCluster.groovy | 26 ++------------------
1 file changed, 2 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/f83a45b5/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
index f8fa29d..be3a6b0 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
@@ -102,7 +102,6 @@ public class ControlledDynamicWebAppCluster extends AbstractEntity implements St
Entities.invokeEffectorList(this, [cluster, controller], Startable.START, [locations:locations]).get();
connectSensors();
- setAttribute(SERVICE_UP, true);
}
public void stop() {
@@ -121,33 +120,12 @@ public class ControlledDynamicWebAppCluster extends AbstractEntity implements St
stop();
start(locations);
}
-
- void updateHostnameFromController() {
- String url = controller.getAttribute(NginxController.ROOT_URL);
- if (url==null) url = controller.getAttribute(AbstractController.ROOT_URL);
- if (url==null || url.contains("://"+AbstractController.ANONYMOUS+":") || url.contains("://"+AbstractController.ANONYMOUS+"/")) {
- //probably isn't necessary, as is done in Nginx?
- String hostname = controller.getAttribute(HOSTNAME);
- Object port = controller.getAttribute(AbstractController.PROXY_HTTP_PORT);
- if (hostname==null || port==null) return;
- url = "http://"+hostname+":"+port+"/";
- LOG.warn("Building URL for $this from $controller: $url");
- }
- setAttribute(ROOT_URL, url);
- }
void connectSensors() {
SensorPropagatingEnricher.newInstanceListeningToAllSensorsBut(cluster, SERVICE_UP, ROOT_URL).
addToEntityAndEmitAll(this);
-
- //following 3 lines (and updateHostname method) unnecessary if above is working, I think
- controller.subscribe(controller, NginxController.ROOT_URL, { updateHostnameFromController() } as SensorEventListener);
- controller.subscribe(controller, NginxController.ROOT_URL, { updateHostnameFromController() } as SensorEventListener);
- controller.subscribe(controller, AbstractController.HOSTNAME, { updateHostnameFromController() } as SensorEventListener);
- updateHostnameFromController();
-
- SensorPropagatingEnricher.newInstanceListeningTo(controller, AbstractController.HOSTNAME, SERVICE_UP).
- addToEntityAndEmitAll(this);
+ SensorPropagatingEnricher.newInstanceListeningTo(controller, AbstractController.HOSTNAME, SERVICE_UP, ROOT_URL).
+ addToEntityAndEmitAll(this);
}
public Integer resize(Integer desiredSize) {