You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/08 19:00:40 UTC
[4/5] git commit: JcloudsLocation: log port when waiting to ssh
JcloudsLocation: log port when waiting to ssh
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0cff1f2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0cff1f2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0cff1f2b
Branch: refs/heads/master
Commit: 0cff1f2b20bf4ed60b23daa83b583720fcbc7d3c
Parents: 09ade72
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 8 15:00:10 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jul 8 15:00:30 2014 +0100
----------------------------------------------------------------------
.../main/java/brooklyn/location/jclouds/JcloudsLocation.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0cff1f2b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
index e4fde3e..06d5759 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1678,6 +1678,8 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
String vmIp = hostAndPortOverride.isPresent() ? hostAndPortOverride.get().getHostText() : JcloudsUtil.getFirstReachableAddress(computeService.getContext(), node);
if (vmIp==null) LOG.warn("Unable to extract IP for "+node+" ("+setup.getDescription()+"): subsequent connection attempt will likely fail");
+ int vmPort = hostAndPortOverride.isPresent() ? hostAndPortOverride.get().getPortOrDefault(22) : 22;
+
long delayMs = -1;
try {
delayMs = Time.parseTimeString(""+waitForSshable);
@@ -1688,9 +1690,10 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
delayMs = Time.parseTimeString(WAIT_FOR_SSHABLE.getDefaultValue());
String user = expectedCredentials.getUser();
- LOG.debug("VM {}: reported online, now waiting {} for it to be sshable on {}@{}{}", new Object[] {
+ LOG.debug("VM {}: reported online, now waiting {} for it to be sshable on {}@{}:{}{}", new Object[] {
setup.getDescription(), Time.makeTimeStringRounded(delayMs),
- user, vmIp, Objects.equal(user, getUser(setup)) ? "" : " (setup user is different: "+getUser(setup)+")"});
+ user, vmIp, vmPort,
+ Objects.equal(user, getUser(setup)) ? "" : " (setup user is different: "+getUser(setup)+")"});
Callable<Boolean> checker;
if (hostAndPortOverride.isPresent()) {