From d75589ecc505c278ba3bfaed8aed01dc61d6665b Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Mon, 25 Jul 2011 13:47:11 -0700
Subject: [PATCH] toned down logging and corrected logback version

---
 apis/nova/pom.xml                                        | 2 +-
 .../callables/RunScriptOnNodeAsInitScriptUsingSsh.java   | 9 ++++++---
 .../compute/domain/internal/TemplateBuilderImpl.java     | 4 ++--
 .../compute/domain/internal/TemplateBuilderImplTest.java | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index dea1e7b827..09889d464d 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.28</version>
+            <version>0.9.29</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSsh.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSsh.java
index 729b1e8db2..a079411d49 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSsh.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSsh.java
@@ -137,7 +137,10 @@ public class RunScriptOnNodeAsInitScriptUsingSsh implements RunScriptOnNode {
          ssh.put(initFile, init.render(OsFamily.UNIX));
       } catch (SshException e) {
          // If there's a problem with the sftp configuration, we can try via ssh exec
-         logger.warn(e, "<< (%s) problem using sftp [%s], attempting via sshexec", ssh.toString(), e.getMessage());
+         if (logger.isTraceEnabled())
+            logger.warn(e, "<< (%s) problem using sftp [%s], attempting via sshexec", ssh.toString(), e.getMessage());
+         else
+            logger.warn("<< (%s) problem using sftp [%s], attempting via sshexec", ssh.toString(), e.getMessage());
          ssh.disconnect();
          ssh.connect();
          ssh.exec("rm " + initFile);
@@ -206,8 +209,8 @@ public class RunScriptOnNodeAsInitScriptUsingSsh implements RunScriptOnNode {
 
    @Override
    public String toString() {
-      return Objects.toStringHelper(this).add("node", node).add("name", init.getInstanceName()).add("runAsRoot",
-               runAsRoot).toString();
+      return Objects.toStringHelper(this).add("node", node).add("name", init.getInstanceName())
+            .add("runAsRoot", runAsRoot).toString();
    }
 
    @Override
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
index 40d23b0a51..2e1bf6d689 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
@@ -570,7 +570,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
       }
       Hardware hardware = resolveSize(hardwareSorter(), supportedImages);
       Image image = resolveImage(hardware, supportedImages);
-      logger.debug("<<   matched image(%s)", image);
+      logger.debug("<<   matched image(%s)", image.getId());
 
       return new TemplateImpl(image, hardware, location, options);
    }
@@ -614,7 +614,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
             logger.warn(exception, "hardware profiles %s\nimage ids %s", hardwarel, transform(images, imageToId));
          throw exception;
       }
-      logger.debug("<<   matched hardware(%s)", hardware);
+      logger.debug("<<   matched hardware(%s)", hardware.getId());
       return hardware;
    }
 
diff --git a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
index 641a0d1c37..7a7eb62366 100644
--- a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
+++ b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
@@ -139,6 +139,7 @@ public class TemplateBuilderImplTest {
       expect(image2.getLocation()).andReturn(defaultLocation).atLeastOnce();
       expect(image.getOperatingSystem()).andReturn(os).atLeastOnce();
       expect(image2.getOperatingSystem()).andReturn(os2).atLeastOnce();
+      expect(image.getId()).andReturn("1");
 
       expect(os.getArch()).andReturn("X86_32").atLeastOnce();
       expect(os2.getArch()).andReturn("X86_64").atLeastOnce();