#351: Stops the done message appears when server errors

Badgerati · Aug 26, 2019 · 2f45fa8 · 2f45fa8
1 parent 50f2d93
commit 2f45fa8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/Private/Helpers.ps1 b/src/Private/Helpers.ps1
@@ -781,7 +781,7 @@ function Close-PodeServer
 {
     param (
         [switch]
-        $Exit
+        $ShowDoneMessage
     )
 
     # stpo all current runspaces
@@ -802,7 +802,7 @@ function Close-PodeServer
     # remove all of the pode temp drives
     Remove-PodePSDrives
 
-    if ($Exit -and ![string]::IsNullOrWhiteSpace($PodeContext.Server.Type) -and !$PodeContext.Server.IsServerless) {
+    if ($ShowDoneMessage -and ![string]::IsNullOrWhiteSpace($PodeContext.Server.Type) -and !$PodeContext.Server.IsServerless) {
         Write-Host " Done" -ForegroundColor Green
     }
 }

diff --git a/src/Public/Core.ps1 b/src/Public/Core.ps1
@@ -82,6 +82,7 @@ function Start-PodeServer
 
     # ensure the session is clean
     $PodeContext = $null
+    $ShowDoneMessage = $true
 
     try {
         # configure the server's root path
@@ -128,9 +129,13 @@ function Start-PodeServer
         Write-Host 'Terminating...' -NoNewline -ForegroundColor Yellow
         $PodeContext.Tokens.Cancellation.Cancel()
     }
+    catch {
+        $ShowDoneMessage = $false
+        throw
+    }
     finally {
         # clean the runspaces and tokens
-        Close-PodeServer -Exit
+        Close-PodeServer -ShowDoneMessage:$ShowDoneMessage
 
         # clean the session
         $PodeContext = $null

diff --git a/tests/unit/Helpers.Tests.ps1 b/tests/unit/Helpers.Tests.ps1
@@ -1208,13 +1208,13 @@ Describe 'Close-PodeServer' {
 
     It 'Closes out pode, but with the done flag' {
         $PodeContext = @{ 'Server' = @{ 'Type' = 'Server' } }
-        Close-PodeServer -Exit
+        Close-PodeServer -ShowDoneMessage
         Assert-MockCalled Write-Host -Times 1 -Scope It
     }
 
     It 'Closes out pode, but with no done flag if serverless' {
         $PodeContext = @{ 'Server' = @{ 'Type' = 'Server'; 'IsServerless' = $true } }
-        Close-PodeServer -Exit
+        Close-PodeServer -ShowDoneMessage
         Assert-MockCalled Write-Host -Times 0 -Scope It
     }
 }