Never say (nearly) Oops again (nextflow-io#4356)

Signed-off-by: Phil Ewels <[email protected]> Signed-off-by: Paolo Di Tommaso <[email protected]> Co-authored-by: Ben Sherman <[email protected]> Co-authored-by: Paolo Di Tommaso <[email protected]>
abhi18av · Oct 28, 2023 · 1dfed1c · 1dfed1c
1 parent fa8d450
commit 1dfed1c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/docs/metadata.md b/docs/metadata.md
@@ -164,7 +164,7 @@ The `onError` event handler is invoked by Nextflow when a runtime or process err
 
 ```groovy
 workflow.onError {
-    println "Oops... Pipeline execution stopped with the following message: ${workflow.errorMessage}"
+    println "Error: Pipeline execution stopped with the following message: ${workflow.errorMessage}"
 }
 ```
 
@@ -186,7 +186,7 @@ workflow.onComplete = {
 }
 
 workflow.onError = {
-    println "Oops .. something when wrong"
+    println "Error: something when wrong"
 }
 ```
 

diff --git a/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy b/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy
@@ -180,7 +180,7 @@ class Launcher {
             colsString.toShort()
         }
         catch( Exception e ) {
-            log.debug "Oops.. not a valid \$COLUMNS value: $colsString"
+            log.debug "Unexpected terminal \$COLUMNS value: $colsString"
             return 0
         }
     }

diff --git a/modules/nextflow/src/main/groovy/nextflow/k8s/K8sTaskHandler.groovy b/modules/nextflow/src/main/groovy/nextflow/k8s/K8sTaskHandler.groovy
@@ -473,7 +473,7 @@ class K8sTaskHandler extends TaskHandler implements FusionAwareTask {
                 client.podDelete(podName)
         }
         else {
-            log.debug "[K8s] Oops.. invalid delete action"
+            log.debug "[K8s] Invalid delete action"
         }
     }
 

diff --git a/modules/nextflow/src/main/groovy/nextflow/processor/StateObj.groovy b/modules/nextflow/src/main/groovy/nextflow/processor/StateObj.groovy
@@ -48,7 +48,7 @@ class StateObj implements Serializable, Cloneable {
      */
     void incSubmitted() {
         if( poisoned )
-            log.debug "Oops.. Cannot process more messages after Poison-Pill was received"
+            log.debug "Cannot process more messages after Poison-Pill was received"
         else
             submitted++
     }
@@ -58,7 +58,7 @@ class StateObj implements Serializable, Cloneable {
      */
     void incCompleted() {
         if( completed >= submitted ) {
-            log.debug "Oops.. Processed messages ($submitted) should not overcome received messages ($submitted) count"
+            log.debug "Processed messages ($submitted) should not overcome received messages ($submitted) count"
         }
         completed++
     }

diff --git a/modules/nextflow/src/main/groovy/nextflow/processor/TaskPollingMonitor.groovy b/modules/nextflow/src/main/groovy/nextflow/processor/TaskPollingMonitor.groovy
@@ -452,7 +452,7 @@ class TaskPollingMonitor implements TaskMonitor {
             log.debug msg.join('\n')
         }
         catch (Throwable e) {
-            log.debug "Oops.. expected exception", e
+            log.debug "Unexpected exception dumping run queue", e
         }
     }
 
@@ -473,7 +473,7 @@ class TaskPollingMonitor implements TaskMonitor {
             log.debug msg.join('\n')
         }
         catch (Throwable e) {
-            log.debug "Oops.. unexpected exception", e
+            log.debug "Unexpected exception dumping submit queue", e
         }
     }
 

diff --git a/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy b/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy
@@ -2165,7 +2165,7 @@ class TaskProcessor {
             return CacheHelper.hasher(keys, mode).hash()
         }
         catch (Throwable e) {
-            final msg = "Oops.. something went wrong while creating task '$name' unique id -- Offending keys: ${ keys.collect {"\n - type=${it.getClass().getName()} value=$it"} }"
+            final msg = "Something went wrong while creating task '$name' unique id -- Offending keys: ${ keys.collect {"\n - type=${it.getClass().getName()} value=$it"} }"
             throw new UnexpectedException(msg,e)
         }
     }

diff --git a/modules/nextflow/src/main/groovy/nextflow/util/ClusterConfig.groovy b/modules/nextflow/src/main/groovy/nextflow/util/ClusterConfig.groovy
@@ -170,7 +170,7 @@ class ClusterConfig  {
             return getClusterJoin().tokenize(':')[1]
         }
         catch (Throwable e) {
-            log.debug "Oops.. Cannot fetch cloud driver name", e
+            log.debug "Cannot fetch cloud driver name", e
             return null
         }
     }

diff --git a/modules/nextflow/src/main/groovy/nextflow/util/LoggerHelper.groovy b/modules/nextflow/src/main/groovy/nextflow/util/LoggerHelper.groovy
@@ -592,7 +592,7 @@ class LoggerHelper {
             return ExceptionUtils.getStackTrace(e).split('\n')
         }
         catch( Throwable t ) {
-            log.warn "Oops.. something went wrong while formatting the error stack trace | ${t.message ?: t}", e
+            log.warn "Something went wrong while formatting the error stack trace | ${t.message ?: t}", e
             return Collections.emptyList() as String[]
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     client.podDelete(podName)
             }
             else {
-                log.debug "[K8s] Oops.. invalid delete action"
+                log.debug "[K8s] Invalid delete action"
             }
         }
@@ Expand Down @@