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:16 UTC
[13/50] brooklyn-library git commit: AbstractController server-pool:
incorporate more comments
AbstractController server-pool: incorporate more comments
- see Alex's comments in https://github.com/brooklyncentral/brooklyn/pull/325
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/6e62d4c7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/6e62d4c7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/6e62d4c7
Branch: refs/heads/0.4.0
Commit: 6e62d4c78b9eeae0a762c45796d82caf06bb9067
Parents: 1684a35
Author: Aled Sage <al...@gmail.com>
Authored: Thu Sep 27 23:51:32 2012 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Sep 27 23:53:43 2012 +0100
----------------------------------------------------------------------
.../main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java | 2 +-
.../brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6e62d4c7/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
index e8091d3..ad917aa 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
@@ -203,7 +203,7 @@ public class NginxSshDriver extends AbstractSoftwareProcessSshDriver implements
boolean running = isRunning();
if (!running) {
- log.debug("Ignoring reload of nginx "+entity+", becausing service is not running (state "+lifecycle+")");
+ log.debug("Ignoring reload of nginx "+entity+", because service is not running (state "+lifecycle+")");
return;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6e62d4c7/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 495dd9d..f8fa29d 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
@@ -124,7 +124,7 @@ public class ControlledDynamicWebAppCluster extends AbstractEntity implements St
void updateHostnameFromController() {
String url = controller.getAttribute(NginxController.ROOT_URL);
- if (url==null) url = controller.getAttribute(AbstractController.SPECIFIED_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);
@@ -142,7 +142,7 @@ public class ControlledDynamicWebAppCluster extends AbstractEntity implements St
//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.SPECIFIED_URL, { updateHostnameFromController() } as SensorEventListener);
+ controller.subscribe(controller, NginxController.ROOT_URL, { updateHostnameFromController() } as SensorEventListener);
controller.subscribe(controller, AbstractController.HOSTNAME, { updateHostnameFromController() } as SensorEventListener);
updateHostnameFromController();