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 6980417E08 for ; Tue, 14 Oct 2014 10:05:17 +0000 (UTC) Received: (qmail 50706 invoked by uid 500); 14 Oct 2014 10:05:17 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 50682 invoked by uid 500); 14 Oct 2014 10:05:17 -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 50673 invoked by uid 99); 14 Oct 2014 10:05:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Oct 2014 10:05:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 14 Oct 2014 10:04:54 +0000 Received: (qmail 49213 invoked by uid 99); 14 Oct 2014 10:04:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Oct 2014 10:04:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 137A9915FB8; Tue, 14 Oct 2014 10:04:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 14 Oct 2014 10:05:01 -0000 Message-Id: In-Reply-To: <639b39df2d094d2597b0301448995719@git.apache.org> References: <639b39df2d094d2597b0301448995719@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B11/16=5D_git_commit=3A_Fix_MonitSshDriver=E2=80=99s_u?= =?utf-8?q?se_of_expandedInstallDir?= X-Virus-Checked: Checked by ClamAV on apache.org Fix MonitSshDriver’s use of expandedInstallDir Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f7c7330d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f7c7330d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f7c7330d Branch: refs/heads/master Commit: f7c7330d102676b53e147c8b8b744aae178b5c3f Parents: 3595fab Author: Aled Sage Authored: Mon Oct 13 21:30:50 2014 +0100 Committer: Aled Sage Committed: Mon Oct 13 21:30:50 2014 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/monitoring/monit/MonitSshDriver.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7c7330d/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java b/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java index 36be869..2272a00 100644 --- a/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java +++ b/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java @@ -37,7 +37,6 @@ import com.google.common.collect.ImmutableMap; public class MonitSshDriver extends AbstractSoftwareProcessSshDriver implements MonitDriver { - private String expandedInstallDir; private String remoteControlFilePath; public MonitSshDriver(MonitNodeImpl entity, SshMachineLocation machine) { @@ -88,7 +87,7 @@ public class MonitSshDriver extends AbstractSoftwareProcessSshDriver implements // NOTE: executing monit in daemon mode will spawn a separate process for the monit daemon so the value of $! cannot be used // instead we use the -p argument String command = format("touch %s && nohup %s/bin/monit -c %s -p %s > out.log 2> err.log < /dev/null &", getMonitPidFile(), - expandedInstallDir, remoteControlFilePath, getMonitPidFile()); + getExpandedInstallDir(), remoteControlFilePath, getMonitPidFile()); newScript(MutableMap.of("usePidFile", false), LAUNCHING) .updateTaskAndFailOnNonZeroResultCode() .body.append(command) @@ -132,11 +131,6 @@ public class MonitSshDriver extends AbstractSoftwareProcessSshDriver implements @Override public String getStatusCmd() { - return format("%s/bin/monit -c %s status", expandedInstallDir, remoteControlFilePath); - } - - @Override - public String getExpandedInstallDir() { - return expandedInstallDir; + return format("%s/bin/monit -c %s status", getExpandedInstallDir(), remoteControlFilePath); } }