SshMachineLocation: log prefix for exec is user@host:port
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bdb22f81 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bdb22f81 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bdb22f81 Branch: refs/heads/0.4.0 Commit: bdb22f8173306e49646037bd235de9c411316068 Parents: a6aa4c5 Author: Aled Sage <[email protected]> Authored: Wed Sep 26 11:13:21 2012 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Sep 26 12:36:17 2012 +0100 ---------------------------------------------------------------------- .../brooklyn/location/basic/SshMachineLocation.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bdb22f81/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java index 1898e6e..09cfb7c 100644 --- a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java +++ b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java @@ -335,8 +335,16 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat PipedOutputStream outE = null; StreamGobbler gO=null, gE=null; try { - String logPrefix = (flags.get("logPrefix") != null) ? ""+flags.get("logPrefix") : getAddress().getHostName(); - + String logPrefix; + if (flags.get("logPrefix") != null) { + logPrefix = ""+flags.get("logPrefix"); + } else { + String hostname = getAddress().getHostName(); + Object port = config.get("sshconfig.port"); + if (port == null) port = leftoverProperties.get("sshconfig.port"); + logPrefix = (user != null ? user+"@" : "") + hostname + (port != null ? ":"+port : ""); + } + if (!truth(flags.get("noStdoutLogging"))) { PipedInputStream insO = new PipedInputStream(); outO = new PipedOutputStream(insO);
