Merge branch 'master' into MODHAADM-71-log-pruning

indexdata · Sep 6, 2024 · e75ba96 · e75ba96
2 parents 461598f + 05ffbcc
commit e75ba96
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/org/folio/harvesteradmin/dataaccess/LegacyHarvesterStorage.java b/src/main/java/org/folio/harvesteradmin/dataaccess/LegacyHarvesterStorage.java
@@ -888,7 +888,7 @@ public Future<HttpResponse<Buffer>> getJobLog(RoutingContext routingContext) {
           } else {
             String from = fromParameter != null && !fromParameter.isEmpty()
                 ? fromParameter
-                : lastStarted.substring(0, 19);
+                : lastStarted;
             getJobLog(id, from).onComplete(ar -> promise.complete(ar.result()));
           }
         } else {
@@ -910,11 +910,10 @@ public Future<HttpResponse<Buffer>> getJobLog(RoutingContext routingContext) {
   public Future<HttpResponse<Buffer>> getJobLog(String harvestableId, String fromDate) {
     Promise<HttpResponse<Buffer>> promise = Promise.promise();
     harvesterGetRequest(HARVESTER_HARVESTABLES_PATH + "/" + harvestableId + "/log?from="
-        + fromDate.substring(0,Math.min(fromDate.length(),19)))
-        .send(ar -> promise.complete(ar.result()));
+            + URLEncoder.encode(fromDate,StandardCharsets.UTF_8))
+            .send(ar -> promise.complete(ar.result()));
     return promise.future();
   }
-
   /**
    * Gets failed records.
    */