Add executor display name rendering

nextflow-io · Apr 13, 2020 · 74c90ca · 74c90ca
1 parent c2e0ac0
commit 74c90ca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/executor/ExecutorFactory.groovy b/modules/nextflow/src/main/groovy/nextflow/executor/ExecutorFactory.groovy
@@ -80,6 +80,14 @@ class ExecutorFactory {
         }
     }
 
+    String getDisplayName(String key) {
+        final clazz = executorsMap.get(key)
+        if( !clazz ) return key
+        final exec = this.executors.get(clazz)
+        if( !exec ) return key
+        exec.getDisplayName() ?: key
+    }
+
     /**
      * Extract the executor name by using the annotation {@code ServiceName} or fallback to simple classname
      * if the annotation is not provided

diff --git a/modules/nextflow/src/main/groovy/nextflow/trace/AnsiLogObserver.groovy b/modules/nextflow/src/main/groovy/nextflow/trace/AnsiLogObserver.groovy
@@ -16,16 +16,17 @@
 
 package nextflow.trace
 
-import static nextflow.util.LoggerHelper.*
-import static org.fusesource.jansi.Ansi.*
-
 import groovy.transform.CompileStatic
 import jline.TerminalFactory
 import nextflow.Session
 import nextflow.processor.TaskHandler
 import nextflow.util.Duration
 import org.fusesource.jansi.Ansi
 import org.fusesource.jansi.AnsiConsole
+import static nextflow.util.LoggerHelper.isHashLogPrefix
+import static org.fusesource.jansi.Ansi.Attribute
+import static org.fusesource.jansi.Ansi.Color
+import static org.fusesource.jansi.Ansi.ansi
 /**
  * Implements an observer which display workflow
  * execution progress and notifications using
@@ -207,12 +208,16 @@ class AnsiLogObserver implements TraceObserver {
         }
     }
 
+    protected String getExecutorName(String key) {
+        session.getExecutorFactory().getDisplayName(key)
+    }
+
     protected void renderExecutors(Ansi term) {
         int count=0
         def line = ''
         for( Map.Entry<String,Integer> entry : executors ) {
             if( count++ ) line += ","
-            line += " $entry.key ($entry.value)"
+            line += " ${getExecutorName(entry.key)} ($entry.value)"
         }
 
         if( count ) {