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

Try to bubble more useful exceptions out

Browse Source
This commit is contained in:
darin.kelkhoff
2025-02-26 15:15:26 -06:00
parent 2a0bc03337
commit 92f0bd3846
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,9 +36,11 @@ import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;
import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.exceptions.QRuntimeException;
import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException;
import com.kingsrook.qqq.backend.core.logging.QLogger;
import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
@ -46,6 +48,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.variants.BackendVariantSetting;
import com.kingsrook.qqq.backend.core.model.metadata.variants.BackendVariantsUtil;
import com.kingsrook.qqq.backend.core.utils.ExceptionUtils;
import com.kingsrook.qqq.backend.core.utils.StringUtils;
import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction;
import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException;
@ -57,6 +60,7 @@ import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.sftp.client.SftpClient;
import org.apache.sshd.sftp.client.SftpClientFactory;
import org.apache.sshd.sftp.common.SftpException;
import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
@ -300,9 +304,10 @@ public class AbstractSFTPAction extends AbstractBaseFilesystemAction<SFTPDirEntr
@Override
public List<SFTPDirEntryWithPath> listFiles(QTableMetaData table, QBackendMetaData backendBase, String requestedPath) throws QException
{
String fullPath = null;
try
{
String fullPath = getFullBasePath(table, backendBase);
fullPath = getFullBasePath(table, backendBase);
if(StringUtils.hasContent(requestedPath))
{
fullPath = stripDuplicatedSlashes(fullPath + File.separatorChar + requestedPath + File.separatorChar);
@ -340,6 +345,12 @@ public class AbstractSFTPAction extends AbstractBaseFilesystemAction<SFTPDirEntr
}
catch(Exception e)
{
SftpException sftpException = ExceptionUtils.findClassInRootChain(e, SftpException.class);
if(sftpException != null)
{
throw new QUserFacingException("SFTP Exception listing [" + Objects.requireNonNullElse(fullPath, "") + "]: " + sftpException.getMessage());
}
throw (new QException("Error listing files", e));
}
}

9
qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/sftp/utils/SFTPOutputStream.java
View File

@ -34,7 +34,9 @@ import java.util.concurrent.atomic.AtomicReference;
import com.kingsrook.qqq.backend.core.logging.QLogger;
import com.kingsrook.qqq.backend.core.utils.SleepUtils;
import org.apache.sshd.sftp.client.SftpClient;
import org.apache.sshd.sftp.common.SftpException;
import org.jetbrains.annotations.NotNull;
import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
/*******************************************************************************
@ -45,6 +47,7 @@ public class SFTPOutputStream extends PipedOutputStream
private static final QLogger LOG = QLogger.getLogger(SFTPOutputStream.class);
private final SftpClient sftpClient;
private final String path;
private final PipedInputStream pipedInputStream;
private final Future<?> putFuture;
@ -62,12 +65,14 @@ public class SFTPOutputStream extends PipedOutputStream
pipedInputStream = new PipedInputStream(this, 32 * 1024);
this.sftpClient = sftpClient;
this.path = path;
putFuture = Executors.newSingleThreadExecutor().submit(() ->
{
try
{
started.set(true);
LOG.debug("Starting sftp put", logPair("path", path));
sftpClient.put(pipedInputStream, path);
}
catch(Exception e)
@ -105,6 +110,10 @@ public class SFTPOutputStream extends PipedOutputStream
{
if(putException.get() != null)
{
if(putException.get() instanceof SftpException sftpException)
{
throw new IOException("Error performing SFTP put for path [" + path + "]: " + sftpException.getMessage());
}
throw new IOException("Error performing SFTP put", putException.get());
}