X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjsch%2FAbstractJschTask.java;h=f26108f4aff46f42c39dcf5134bb2d5eedbbe406;hb=7cb867319d0f8b1b0af3e7eb3f9833b091281320;hp=7054d384c35f073d8eb883dbbaab86816911f3ab;hpb=63a0e9138108ea97610dcd95cf3e2571c7f2de24;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
index 7054d384c..f26108f4a 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
@@ -3,6 +3,8 @@ package org.argeo.slc.jsch;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 
 import com.jcraft.jsch.JSch;
@@ -10,16 +12,40 @@ import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
 public abstract class AbstractJschTask implements Runnable {
+	private final static Log log = LogFactory.getLog(AbstractJschTask.class);
+
 	private SshTarget sshTarget;
 
 	protected Session openSession() {
+		if (sshTarget.getSession() != null) {
+			Session session = sshTarget.getSession();
+			if (session.isConnected()) {
+				if (log.isTraceEnabled())
+					log.debug("Using cached session to " + getSshTarget()
+							+ " via SSH");
+				return session;
+			}
+		}
+
 		try {
 			JSch jsch = new JSch();
+			if (sshTarget.getUsePrivateKey()
+					&& sshTarget.getLocalPrivateKey().exists())
+				jsch.addIdentity(sshTarget.getLocalPrivateKey()
+						.getAbsolutePath());
 			Session session = jsch.getSession(getSshTarget().getUser(),
 					getSshTarget().getHost(), getSshTarget().getPort());
 
 			session.setUserInfo(getSshTarget().getUserInfo());
 			session.connect();
+			if (log.isDebugEnabled())
+				log.debug("Connected to " + getSshTarget() + " via SSH");
+			if (sshTarget.getSession() != null) {
+				if (log.isDebugEnabled())
+					log.debug("The cached session to " + getSshTarget()
+							+ " was disconnected and was reste.");
+				sshTarget.setSession(session);
+			}
 			return session;
 		} catch (JSchException e) {
 			throw new SlcException("Could not open session to "
@@ -32,7 +58,12 @@ public abstract class AbstractJschTask implements Runnable {
 		try {
 			run(session);
 		} finally {
-			session.disconnect();
+			if (sshTarget.getSession() == null) {
+				session.disconnect();
+				if (log.isDebugEnabled())
+					log.debug("Disconnected from " + getSshTarget()
+							+ " via SSH");
+			}
 		}
 	}