Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 003DF17505 for ; Wed, 7 Oct 2015 10:27:26 +0000 (UTC) Received: (qmail 25818 invoked by uid 500); 7 Oct 2015 10:27:19 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 25796 invoked by uid 500); 7 Oct 2015 10:27:19 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 25787 invoked by uid 99); 7 Oct 2015 10:27:19 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2015 10:27:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id CBE691A229D for ; Wed, 7 Oct 2015 10:27:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id F2BvOaDnlG1o for ; Wed, 7 Oct 2015 10:27:11 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 9DB1320645 for ; Wed, 7 Oct 2015 10:27:11 +0000 (UTC) Received: (qmail 25136 invoked by uid 99); 7 Oct 2015 10:27:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2015 10:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5E838E0098; Wed, 7 Oct 2015 10:27:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sjcorbett@apache.org To: commits@brooklyn.incubator.apache.org Date: Wed, 07 Oct 2015 10:27:11 -0000 Message-Id: <9cf93d8c82d941bc88b9afc9f2100803@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri Oct 2 15:15:33 2015 +0300 Committer: Svetoslav Neykov 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(); }