Merge pull request #2 from mattock/waitforstatus

Make service shutdown more robust
mattock · Nov 15, 2016 · dbf74cc · dbf74cc
2 parents efea46f + a1012f3
commit dbf74cc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/test-openvpn.ps1 b/test-openvpn.ps1
@@ -95,8 +95,12 @@ Function Stop-Gui {
 }
 
 Function Stop-Openvpnservice {
-    Stop-Service OpenVPNService
-    Stop-Service OpenVPNServiceLegacy
+    foreach ($service in 'OpenVPNService', 'OpenVPNServiceLegacy') {
+        if (Get-Service -Erroraction Ignore $service) {
+            Stop-Service $service
+            (Get-Service $service).WaitForStatus('Stopped')
+        }
+    }
 }
 
 # Stop all openvpn-related processes