Fix Quiet cli option is not honoured

nextflow-io · Apr 30, 2019 · e656e4b · e656e4b
1 parent 95f4dd7
commit e656e4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/cli/CliOptions.groovy b/modules/nextflow/src/main/groovy/nextflow/cli/CliOptions.groovy
@@ -19,6 +19,7 @@ package nextflow.cli
 import com.beust.jcommander.DynamicParameter
 import com.beust.jcommander.Parameter
 import groovy.util.logging.Slf4j
+import nextflow.exception.AbortOperationException
 import org.fusesource.jansi.Ansi
 
 /**
@@ -86,12 +87,18 @@ class CliOptions {
     Boolean ansiLog
 
     boolean getAnsiLog() {
+        if( ansiLog && quiet )
+            throw new AbortOperationException("Command line options `quiet` and `ansi-log` cannot be used together")
+
         if( ansiLog != null )
             return ansiLog
 
         if( background )
             return ansiLog = false
 
+        if( quiet )
+            return ansiLog = false
+
         final env = System.getenv('NXF_ANSI_LOG')
         if( env ) try {
             return Boolean.parseBoolean(env)
@@ -102,6 +109,4 @@ class CliOptions {
         return Ansi.isEnabled()
     }
 
-
-
 }
diff --git a/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy b/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy
@@ -394,6 +394,10 @@ class Launcher {
             System.exit(1)
 
         }
+        catch ( AbortOperationException e ) {
+            System.err.println (e.message ?: "Unknown abort reason")
+            System.exit(1)
+        }
         catch( Throwable e ) {
             e.printStackTrace(System.err)
             System.exit(1)
@@ -620,7 +624,7 @@ class Launcher {
      *
      * @param args The program options as specified by the user on the CLI
      */
-    public static void main(String... args)  {
+    static void main(String... args)  {
 
         final launcher = DripMain.LAUNCHER ?: new Launcher()
         final status = launcher .command(args) .run()