brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [2/3] incubator-brooklyn git commit: Improves logging in JcloudsLocation
Date Thu, 22 Oct 2015 12:32:39 GMT
Improves logging in JcloudsLocation


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3351c965
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3351c965
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3351c965

Branch: refs/heads/master
Commit: 3351c9657117b239957a60e990e05bbaf30d2b08
Parents: 24b0f3e
Author: Aled Sage <aled.sage@gmail.com>
Authored: Thu Oct 22 11:58:36 2015 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Thu Oct 22 12:02:10 2015 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/location/jclouds/JcloudsLocation.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3351c965/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 4c3297d..9c87479 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -965,9 +965,11 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
 
             // Apply any optional app-specific customization.
             for (JcloudsLocationCustomizer customizer : getCustomizers(setup)) {
+                LOG.debug("Customizing machine {}, using customizer {}", machineLocation,
customizer);
                 customizer.customize(this, computeService, machineLocation);
             }
             for (MachineLocationCustomizer customizer : getMachineCustomizers(setup)) {
+                LOG.debug("Customizing machine {}, using customizer {}", machineLocation,
customizer);
                 customizer.customize(machineLocation);
             }
 
@@ -2613,10 +2615,12 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
                 credsToString.add("user="+user+", password="+password+", key="+key);
             }
 
-            LOG.debug("VM {}: reported online, now waiting {} for it to be contactable on
{}; using credentials {}",
+            LOG.debug("VM {}: reported online, now waiting {} for it to be contactable on
{}; trying {} credential{}: {}",
                     new Object[] {
                             setup.getDescription(), timeout,
                             hostAndPort,
+                            credentialsToLog.size(),
+                            Strings.s(credentialsToLog.size()),
                             (credsToString.size() == 1) ? credsToString.get(0) : "(multiple!):"
+ Joiner.on("\n\t").join(credsToString)
                     });
         }


Mime
View raw message