Add warning on Google Logs failure [ci fast]

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Dec 3, 2022 · bdbcdde · bdbcdde
1 parent b397506
commit bdbcdde
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/plugins/nf-google/src/main/nextflow/cloud/google/batch/logging/BatchLogging.groovy b/plugins/nf-google/src/main/nextflow/cloud/google/batch/logging/BatchLogging.groovy
@@ -48,11 +48,21 @@ class BatchLogging {
     }
 
     String stdout(String jobId) {
-        return fetchLogs(jobId)[0]
+        return safeLogs(jobId,0)
     }
 
     String stderr(String jobId) {
-        return fetchLogs(jobId)[1]
+        return safeLogs(jobId,1)
+    }
+
+    protected String safeLogs(String jobId, int index) {
+        try {
+            return fetchLogs(jobId)[index]
+        }
+        catch (Exception e) {
+            log.warn("Cannot read logs for Batch job '$jobId' - cause: ${e.message}", e)
+            return null
+        }
     }
 
     @Memoized(maxCacheSize = 1000)
@@ -70,8 +80,6 @@ class BatchLogging {
             for (LogEntry logEntry : page.iterator()) {
                 parseOutput(logEntry, stdout, stderr)
             }
-        } catch (Exception e) {
-            log.debug "[GOOGLE BATCH] Cannot read logs for job: `$uid` | ${e.message}"
         }
         return [ stdout.toString(), stderr.toString() ]
     }
@@ -84,4 +92,4 @@ class BatchLogging {
             stdout.append(output)
         }
     }
-}
+}
diff --git a/plugins/nf-google/src/test/nextflow/cloud/google/batch/logging/BatchLoggingTest.groovy b/plugins/nf-google/src/test/nextflow/cloud/google/batch/logging/BatchLoggingTest.groovy
@@ -32,7 +32,6 @@ import groovy.util.logging.Slf4j
 import nextflow.Session
 import nextflow.cloud.google.batch.client.BatchClient
 import nextflow.cloud.google.batch.client.BatchConfig
-import nextflow.cloud.google.batch.logging.BatchLogging
 import spock.lang.IgnoreIf
 import spock.lang.Requires
 import spock.lang.Specification