micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix s3

Browse source
This commit is contained in:
Maksim Tereshin 2024-11-27 08:20:13 +01:00
parent 7ceed04db1
commit 8a7422286d
No known key found for this signature in database
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
config-data-executor/src/main/java/org/micord/service/RequestService.java
View file

@ -49,9 +49,12 @@ public class RequestService {
CompletableFuture.allOf(requestFutures.toArray(new CompletableFuture[0])) CompletableFuture.allOf(requestFutures.toArray(new CompletableFuture[0]))
.thenRun(() -> logger.info("Successfully processed all S3 requests.")) .thenRun(() -> logger.info("Successfully processed all S3 requests."))
.exceptionally(ex -> { .whenComplete((result, ex) -> {
logger.error("Failed to process S3 requests", ex); if (ex != null) {
return null; logger.error("Error processing S3 requests", ex);
} else {
logger.info("Successfully processed all S3 requests.");
}
}); });
} }
} }
@ -65,7 +68,7 @@ public class RequestService {
try (Connection connection = DatabaseConnection.getConnection( try (Connection connection = DatabaseConnection.getConnection(
argument.getRequestArgumentConnectionParams())) { argument.getRequestArgumentConnectionParams())) {
Map<String, Object> query = buildSqlQueryForS3(request.getRequestURL(), ids); Map<String, Object> query = buildSqlQueryForS3(argument.getRequestArgumentURL(), ids);
logger.debug("Starting fetching paths from database for S3 request"); logger.debug("Starting fetching paths from database for S3 request");
long startExecTime = System.currentTimeMillis(); long startExecTime = System.currentTimeMillis();
@ -86,6 +89,11 @@ public class RequestService {
HttpRequest httpRequest; HttpRequest httpRequest;
logger.debug("Starting building HTTP request for S3 request"); logger.debug("Starting building HTTP request for S3 request");
long startExecTime = System.currentTimeMillis(); long startExecTime = System.currentTimeMillis();
if (file == null || file.isBlank()) {
logger.warn("Skipping invalid file path: {}", file);
return;
}
try { try {
httpRequest = S3HttpConnection.buildHttpRequest(request, file); httpRequest = S3HttpConnection.buildHttpRequest(request, file);
} }