You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/12/11 16:51:00 UTC
[1/2] incubator-brooklyn git commit: Fix jboss7 serviceUp
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.8.x b3e523d2a -> a6c4ea3b7
Fix jboss7 serviceUp
Previously, serviceUp was never set to true, for two reasons:
1. because connectServiceUpIsRunning was not called, nothing was
unsetting the service-not-up-indicator for SERVICE_PROCESS_IS_RUNNING
2. because the service-not-up-indicator for MANAGEMENT_URL_UP said
suppressDuplicates=true, then it checked if the map was equal to
the “old” map before publishing. But the map was the same object,
and that object had been modified in-place. So the object was
always equal to itself. It therefore never did an emit(), so the
enricher that listened to it to set serviceUp never fired.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/155a570b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/155a570b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/155a570b
Branch: refs/heads/0.8.x
Commit: 155a570b95f9746ba10a9f93c490e60cbe035f9c
Parents: 09bfa07
Author: Aled Sage <al...@gmail.com>
Authored: Sat Sep 19 15:41:05 2015 +0100
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Fri Dec 11 13:15:43 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/155a570b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
index 09f09c1..51e624d 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
@@ -126,10 +126,11 @@ public class JBoss7ServerImpl extends JavaWebAppSoftwareProcessImpl implements J
}
protected void connectServiceUp() {
+ connectServiceUpIsRunning();
+
addEnricher(Enrichers.builder().updatingMap(Attributes.SERVICE_NOT_UP_INDICATORS)
.from(MANAGEMENT_URL_UP)
.computing(Functionals.ifNotEquals(true).value("Management URL not reachable") )
- .suppressDuplicates(true)
.build());
}
[2/2] incubator-brooklyn git commit: This closes #1103
Posted by al...@apache.org.
This closes #1103
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a6c4ea3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a6c4ea3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a6c4ea3b
Branch: refs/heads/0.8.x
Commit: a6c4ea3b76fe1f2f4208722f34b3948b2b267c3b
Parents: b3e523d 155a570
Author: Aled Sage <al...@gmail.com>
Authored: Fri Dec 11 15:50:48 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Dec 11 15:50:48 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------