QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-17 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better version (i hope) of using ssh & sftp client objects

Browse Source
This commit is contained in:
darin.kelkhoff
2025-02-19 20:17:01 -06:00
parent dcf7218abf
commit 2502d102d9
1 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/sftp/actions/AbstractSFTPAction.java
View File

@ -62,7 +62,43 @@ public class AbstractSFTPAction extends AbstractBaseFilesystemAction<SFTPDirEntr
{ {
private static final QLogger LOG = QLogger.getLogger(AbstractSFTPAction.class); private static final QLogger LOG = QLogger.getLogger(AbstractSFTPAction.class);
private SshClient sshClient; /***************************************************************************
** singleton implementing Initialization-on-Demand Holder idiom
** to help ensure only a single SshClient object exists in a server.
***************************************************************************/
private static class SshClientManager
{
/***************************************************************************
**
***************************************************************************/
private static class Holder
{
private static final SshClient INSTANCE = SshClient.setUpDefaultClient();
static
{
INSTANCE.start();
}
}
/***************************************************************************
**
***************************************************************************/
public static SshClient getInstance()
{
return Holder.INSTANCE;
}
}
////////////////////////////////////////////////////////////////
// open clientSessionFirst, then sftpClient //
// and close them in reverse (sftpClient, then clientSession) //
////////////////////////////////////////////////////////////////
private ClientSession clientSession; private ClientSession clientSession;
private SftpClient sftpClient; private SftpClient sftpClient;
@ -139,22 +175,21 @@ public class AbstractSFTPAction extends AbstractBaseFilesystemAction<SFTPDirEntr
{ {
Consumer<AutoCloseable> closer = closable -> Consumer<AutoCloseable> closer = closable ->
{ {
if(closable != null) if(closable != null)
{ {
try try
{ {
closable.close(); closable.close();
} }
catch(Exception e) catch(Exception e)
{ {
LOG.info("Error closing SFTP resource", e, logPair("type", closable.getClass().getSimpleName())); LOG.info("Error closing SFTP resource", e, logPair("type", closable.getClass().getSimpleName()));
} }
} }
}; };
closer.accept(sshClient);
closer.accept(clientSession);
closer.accept(sftpClient); closer.accept(sftpClient);
closer.accept(clientSession);
} }
@ -164,10 +199,7 @@ public class AbstractSFTPAction extends AbstractBaseFilesystemAction<SFTPDirEntr
***************************************************************************/ ***************************************************************************/
protected SftpClient makeConnection(String username, String hostName, Integer port, String password) throws IOException protected SftpClient makeConnection(String username, String hostName, Integer port, String password) throws IOException
{ {
this.sshClient = SshClient.setUpDefaultClient(); this.clientSession = SshClientManager.getInstance().connect(username, hostName, port).verify().getSession();
sshClient.start();
this.clientSession = sshClient.connect(username, hostName, port).verify().getSession();
clientSession.addPasswordIdentity(password); clientSession.addPasswordIdentity(password);
clientSession.auth().verify(); clientSession.auth().verify();