Tidy up

Author: stephenc

src/main/java/com/cloudbees/jenkins/plugins/sshagent/SSHAgentBuildWrapper.java

@@ -44,6 +44,7 @@
 import org.kohsuke.stapler.Stapler;
 
 import java.io.IOException;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -98,8 +99,7 @@ public Environment setUp(AbstractBuild build, final Launcher launcher, BuildList
         try {
             return new SSHAgentEnvironment(launcher, listener, userPrivateKey);
         } catch (Throwable e) {
-            listener.fatalError(Messages.SSHAgentBuildWrapper_CouldNotStartAgent());
-            e.printStackTrace(listener.getLogger());
+            e.printStackTrace(listener.fatalError(Messages.SSHAgentBuildWrapper_CouldNotStartAgent()));
             return null;
         }
     }
@@ -179,18 +179,25 @@ public SSHAgentEnvironment(Launcher launcher, final BuildListener listener,
                                    final SSHUserPrivateKey sshUserPrivateKey) throws Throwable {
             RemoteAgent agent = null;
             listener.getLogger().println("[ssh-agent] Looking for ssh-agent implementation...");
+            Map<String,Throwable> faults = new LinkedHashMap<String, Throwable>();
             for (RemoteAgentFactory factory : Hudson.getInstance().getExtensionList(RemoteAgentFactory.class)) {
                 if (factory.isSupported(launcher, listener)) {
                     try {
                         listener.getLogger().println("[ssh-agent]   " + factory.getDisplayName());
                         agent = factory.start(launcher, listener);
                         break;
                     } catch (Throwable t) {
-                        // ignore
+                        faults.put(factory.getDisplayName(), t);
                     }
                 }
             }
             if (agent == null) {
+                listener.getLogger().println("[ssh-agent] FATAL: Could not find a suitable ssh-agent provider");
+                listener.getLogger().println("[ssh-agent] Diagnostic report");
+                for (Map.Entry<String,Throwable> fault: faults.entrySet()) {
+                    listener.getLogger().println("[ssh-agent] * " + fault.getKey());
+                    fault.getValue().printStackTrace(listener.getLogger());
+                }
                 throw new RuntimeException("[ssh-agent] Could not find a suitable ssh-agent provider.");
             }
             this.agent = agent;

src/main/java/com/cloudbees/jenkins/plugins/sshagent/mina/MinaRemoteAgentFactory.java

@@ -43,7 +43,7 @@ public class MinaRemoteAgentFactory extends RemoteAgentFactory {
      */
     @Override
     public String getDisplayName() {
-        return "Java/JNI ssh-agent";
+        return "Java/tomcat-native ssh-agent";
     }
 
     /**