Mark job as failed if errors/exceptions exist

poshbotio · Mar 30, 2020 · 4451920 · 4451920
1 parent 338391d
commit 4451920
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/PoshBot/Classes/Bot.ps1 b/PoshBot/Classes/Bot.ps1
@@ -481,7 +481,7 @@ class Bot : BaseLogger {
                         $this.LogInfo([LogSeverity]::Error, "Errors encountered running command [$($cmdExecContext.FullyQualifiedCommandName)]", $cmdExecContext.Result.Errors)
                     }
                 } else {
-                    $this.LogVerbose('Command execution result', $cmdExecContext.Result)
+                    $this.LogVerbose('Command execution result', $cmdExecContext.Result.Output)
                     foreach ($resultOutput in $cmdExecContext.Result.Output) {
                         if ($null -ne $resultOutput) {
                             if ($this._IsCustomResponse($resultOutput)) {

diff --git a/PoshBot/Classes/CommandExecutor.ps1 b/PoshBot/Classes/CommandExecutor.ps1
@@ -177,12 +177,9 @@ class CommandExecutor : BaseLogger {
                     $this.LogVerbose("Job [$($cmdExecContext.Id)] is complete")
                     $cmdExecContext.Complete = $true
                     $cmdExecContext.Ended = (Get-Date).ToUniversalTime()
-
                     $cmdExecContext.RunspaceJob.EndJob([ref]$cmdExecContext.Result)
 
-
                     $this.LogVerbose("Command [$($cmdExecContext.FullyQualifiedCommandName)] completed with successful result [$($cmdExecContext.Result.Success)]")
-
                 }
 
                 # Determine if job had any terminating errors and capture error stream

diff --git a/PoshBot/Classes/RunspaceJob.ps1 b/PoshBot/Classes/RunspaceJob.ps1
@@ -29,15 +29,17 @@ class RunspaceJob {
         $CommandResult.Value.Streams.Verbose     = $this.PowerShell.Streams.Verbose.ReadAll()
         $CommandResult.Value.Streams.Warning     = $this.PowerShell.Streams.Warning.ReadAll()
 
-        $CommandResult.Value.Success = $true
         try {
             $CommandResult.Value.Output  = $this.PowerShell.EndInvoke($this.Handle)
         } catch {
-            $CommandResult.Value.Success = $false
             # Unwrap the exception otherwise it will blame EndInvoke for the exception
             #   e.g. Exception calling "EndInvoke" with "1" argument(s): "Attempted to divide by zero."
             $CommandResult.Value.Errors = $_.Exception.InnerException.ErrorRecord
+        } finally {
+            $this.PowerShell.Dispose()
         }
-        $this.PowerShell.Dispose()
+
+        # # Job is deemed successful if no items in error stream
+        $CommandResult.Value.Success = $CommandResult.Value.Errors -eq 0
     }
 }