brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject [04/10] brooklyn-server git commit: NotUpDiagnostics: don’t collect if starting && !up
Date Tue, 22 Mar 2016 18:06:46 GMT
NotUpDiagnostics: don’t collect if starting && !up

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

Branch: refs/heads/master
Commit: 0b9682b8830df7715bb8b579cfc40a1734f03038
Parents: 9f1a120
Author: Aled Sage <aled.sage@gmail.com>
Authored: Fri Mar 18 23:09:04 2016 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Sat Mar 19 22:03:56 2016 +0000

----------------------------------------------------------------------
 .../apache/brooklyn/entity/software/base/SoftwareProcessImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0b9682b8/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
index ace4ebe..4bf6543 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
@@ -172,7 +172,7 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements
Soft
             Lifecycle state = entity.getAttribute(SERVICE_STATE_ACTUAL);
             if (up == null || up) {
                 entity.sensors().set(ServiceStateLogic.SERVICE_NOT_UP_DIAGNOSTICS, ImmutableMap.<String,
Object>of());
-            } else if (state == null || state == Lifecycle.CREATED) {
+            } else if (state == null || state == Lifecycle.CREATED || state == Lifecycle.STARTING)
{
                 // not yet started; do nothing
             } else if (state == Lifecycle.STOPPING || state == Lifecycle.STOPPED || state
== Lifecycle.DESTROYED) {
                 // stopping/stopped, so expect not to be up; get rid of the diagnostics.


Mime
View raw message