small error handling and formatting fixes

jantari · Mar 18, 2023 · 930fd83 · 930fd83 · github-actions · Mar 18, 2023
1 parent 7e17c81
commit 930fd83
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/private/Debug-LongRunningProcess.ps1 b/private/Debug-LongRunningProcess.ps1
@@ -118,9 +118,17 @@
 
     Write-Debug "Process $($Process.ID) ('$($Process.ProcessName)'):"
     Write-Debug "  Session: $($Process.SessionId)"
-    Write-Debug "  CommandLine: $($CimProcessInformation.CommandLine)"
+    if ($CimProcessInformation.CommandLine) {
+        Write-Debug "  CommandLine: $($CimProcessInformation.CommandLine)"
+    } else {
+        Write-Debug "  CommandLine: <BLANK / INACCESSIBLE>"
+    }
     Write-Debug "  StartTime: $($Process.StartTime.TimeOfDay)"
-    Write-Debug "  Parent Id: $($CimProcessInformation.ParentProcessId)"
+    if ($CimProcessInformation.ParentProcessId) {
+        Write-Debug "  Parent Id: $($CimProcessInformation.ParentProcessId)"
+    } else {
+        Write-Debug "  Parent Id: <BLANK / INACCESSIBLE>"
+    }
 
     if ($Process.Threads.ThreadState -ne 'Wait') {
         $AllThreadsWaiting = $false

diff --git a/private/Expand-LSUpdate.ps1 b/private/Expand-LSUpdate.ps1
@@ -8,6 +8,7 @@
     )
 
     if ($Package.Installer.ExtractCommand) {
+        Write-Verbose "Extracting package $($Package.ID) ..."
         $extractionProcess = Invoke-PackageCommand -Path $WorkingDirectory -Command $Package.Installer.ExtractCommand -RuntimeLimit $script:LSUClientConfiguration.MaxExtractRuntime
         if ($extractionProcess.Err) {
             Write-Warning "Extraction of package $($Package.ID) has failed!`r`n"

diff --git a/private/Get-WindowsVersion.ps1 b/private/Get-WindowsVersion.ps1
@@ -9,7 +9,7 @@
 
     $Versions = [System.Collections.Generic.Dictionary[string, Version]]::new()
 
-    $CmdOutput = Invoke-PackageCommand -Path $env:SystemRoot -Executable "${env:SystemRoot}\System32\cmd.exe" -Arguments '/D /C VER'
+    $CmdOutput = Invoke-PackageCommand -Path $env:SystemRoot -Executable "${env:SystemRoot}\System32\cmd.exe" -Arguments '/D /C VER' -RuntimeLimit ([TimeSpan]::FromMinutes(1))
     if (-not $CmdOutput.Err) {
         $CmdOutputRegex = [regex]::match($CmdOutput.Info.StandardOutput, '[\d\.]+')
         if ($CmdOutputRegex.Success) {

diff --git a/private/Invoke-PackageCommand.ps1 b/private/Invoke-PackageCommand.ps1
@@ -262,12 +262,13 @@
                 Write-Debug "(Current session ID: $( [System.Diagnostics.Process]::GetCurrentProcess().SessionId ), Environment.UserInteractive: $( [System.Environment]::UserInteractive ))"
                 Write-Warning "Process '$Executable' has been running for $($RunspaceTimer.Elapsed)"
 
+                # Get-Process -Id errors when passed an empty array so test it first
                 if ($ProcessIdList) {
-                    foreach ($ProcessId in $ProcessIdList) {
-                        $Process = Get-Process -Id $ProcessId
-                        Write-Warning "${ProcessId}: '$($Process.ProcessName)' started at $($Process.StartTime.TimeOfDay)"
+                    # Getting and piping all processes at once with ErrorAction Ignore silently skips over any process that has already exited
+                    Get-Process -Id $ProcessIdList -ErrorAction Ignore | ForEach-Object {
+                        Write-Warning "$($_.Id): '$($_.ProcessName)' started at $($_.StartTime.TimeOfDay)"
 
-                        $ProcessDiagnostics = Debug-LongRunningProcess -Process $Process
+                        $ProcessDiagnostics = Debug-LongRunningProcess -Process $_
                         if ($ProcessDiagnostics.InteractableWindows) {
                             Write-Warning "Process has windows open, this can help troubleshoot if it is stuck:"
                             foreach ($OpenWindow in $ProcessDiagnostics.InteractableWindows) {