enable optional stacktrace printing. throw runtime/commandrun errors …

…upwards
rundeck · Oct 19, 2017 · 39bd817 · 39bd817
1 parent 02ce072
commit 39bd817
Showing 1 changed file with 32 additions and 3 deletions.
diff --git a/toolbelt/src/main/java/com/simplifyops/toolbelt/ToolBelt.java b/toolbelt/src/main/java/com/simplifyops/toolbelt/ToolBelt.java
@@ -240,6 +240,7 @@ public ToolBelt bannerResource(String resource) {
     private static class CommandContext {
         private CommandInput inputParser;
         private CommandOutput output;
+        private boolean printStackTrace;
 
 
         CommandInput getInputParser() {
@@ -257,6 +258,14 @@ void setInputParser(CommandInput inputParser) {
         public void setOutput(CommandOutput output) {
             this.output = output;
         }
+
+        public boolean isPrintStackTrace() {
+            return printStackTrace;
+        }
+
+        public void setPrintStackTrace(boolean printStackTrace) {
+            this.printStackTrace = printStackTrace;
+        }
     }
 
     private static class CommandSet implements Tool, CommandInvoker {
@@ -271,6 +280,7 @@ private static class CommandSet implements Tool, CommandInvoker {
         Tool other;
         private boolean showBanner;
         Supplier<String> banner;
+        Supplier<Boolean> printStackTrace;
         public boolean hidden;
 
         CommandSet(String name) {
@@ -325,9 +335,11 @@ public boolean runMain(final String[] args, final boolean exitSystem) {
             } catch (CommandRunFailure commandRunFailure) {
                 context.getOutput().error(commandRunFailure.getMessage());
                 //verbose
-                StringWriter sb = new StringWriter();
-                commandRunFailure.printStackTrace(new PrintWriter(sb));
-                context.getOutput().error(sb.toString());
+                if (printStackTrace == null || printStackTrace.get()) {
+                    StringWriter sb = new StringWriter();
+                    commandRunFailure.printStackTrace(new PrintWriter(sb));
+                    context.getOutput().error(sb.toString());
+                }
             }
             if (!result && exitSystem) {
                 System.exit(2);
@@ -666,6 +678,17 @@ public ToolBelt commandInput(CommandInput input) {
         return this;
     }
 
+    /**
+     * Enable or disable stacktrace printing on error
+     *
+     * @param printStackTrace true to print stack traces (default)
+     *
+     * @return this
+     */
+    public ToolBelt printStackTrace(boolean printStackTrace) {
+        commands.printStackTrace = () -> printStackTrace;
+        return this;
+    }
 
     /**
      * Build the Tool
@@ -784,6 +807,12 @@ public boolean run(String[] args) throws CommandRunFailure, InputError {
                     if (e.getCause() instanceof InputError) {
                         throw (InputError) e.getCause();
                     }
+                    if (e.getCause() instanceof RuntimeException) {
+                        throw (RuntimeException) e.getCause();
+                    }
+                    if (e.getCause() instanceof CommandRunFailure) {
+                        throw (CommandRunFailure) e.getCause();
+                    }
                     e.getCause().printStackTrace();
                 } else {
                     e.printStackTrace();