You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/10/07 12:27:11 UTC

[1/2] incubator-brooklyn git commit: Fix BrooklynNode isRunning check

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 8aae07adb -> e94897849


Fix BrooklynNode isRunning check


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/31cbc8fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/31cbc8fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/31cbc8fc

Branch: refs/heads/master
Commit: 31cbc8fc68e224545e69e2f127aa64051ae6922d
Parents: e92dd1e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Oct 2 15:15:33 2015 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Oct 2 15:15:33 2015 +0300

----------------------------------------------------------------------
 .../apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/31cbc8fc/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
index e21200d..3fced8a 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
@@ -78,6 +78,7 @@ import org.apache.brooklyn.util.time.Duration;
 import org.apache.brooklyn.util.time.Time;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableMap;
@@ -502,6 +503,11 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod
                 .from(WEB_CONSOLE_ACCESSIBLE)
                 .computing(Functionals.ifNotEquals(true).value("URL where Brooklyn listens is not answering correctly") )
                 .build());
+
+            addEnricher(Enrichers.builder().transforming(WEB_CONSOLE_ACCESSIBLE)
+                    .computing(Functions.identity())
+                    .publishing(SERVICE_PROCESS_IS_RUNNING)
+                    .build());
         } else {
             connectServiceUpIsRunning();
         }


[2/2] incubator-brooklyn git commit: This closes #932

Posted by sj...@apache.org.
This closes #932


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e9489784
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e9489784
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e9489784

Branch: refs/heads/master
Commit: e948978497cb8f039164189769d123c38b56fa9c
Parents: 8aae07a 31cbc8f
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Oct 7 11:26:47 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Oct 7 11:26:47 2015 +0100

----------------------------------------------------------------------
 .../apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e9489784/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
----------------------------------------------------------------------