Update JobsTimeOut to 900 seconds and improve timeout handling in Invoke-CommandWithTimeout

rebelinux · rebelinux · commit 5751f68283c5 · 2025-12-08T21:46:32.000-04:00
diff --git a/AsBuiltReport.Microsoft.AD.json b/AsBuiltReport.Microsoft.AD.json
@@ -42,7 +42,7 @@
         "EnableDiagramSignature": false,
         "SignatureAuthorName": "",
         "SignatureCompanyName": "",
-        "JobsTimeOut": 600
+        "JobsTimeOut": 900
     },
     "InfoLevel": {
         "_comment_": "0 = Disabled, 1 = Enabled, 2 = Adv Summary, 3 = Detailed",
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Migrate function located in SharedUtilsFunctions.ps1 to its own file for better modularity and maintainability
 - Change export diagrams format to "PDF" by default
 - Improve Get-RequiredFeatures function to better handle feature retrieval and error handling
+- Improve timeout warning message in Invoke-CommandWithTimeout
 
 ### Fixed
 
diff --git a/README.md b/README.md
@@ -184,7 +184,7 @@ The **Options** schema allows certain options within the report to be toggled on
 | Exclude.Domains         | Array List         | Empty     | Allow to filter on AD Domain FQDN                                             |
 | Include.DCs             | Array List         | Empty     | Allow only a list of Active Directory Domain FQDN to document.                |
 | Include.Domains         | Array List         | Empty     | Allow only a list of Active Directory Domain Controller FQDN to document.     |
-| JobsTimeOut             | Int                | 600       | Allow to set the timeout (in seconds) for remote jobs execution               |
+| JobsTimeOut             | Int                | 900       | Allow to set the timeout (in seconds) for remote jobs execution               |
 | PSDefaultAuthentication | Negotiate/Kerberos | Negotiate | Allow to set the value of the PSRemoting authentication method.               |
 |                         |                    |           | For Workgroup authentication Negotiate value is required.                     |
 | ShowDefinitionInfo      | true/false         | False     | Toggle to enable/disable Microsoft AD term explanations                       |
diff --git a/Src/Private/Get-AbrDomainSection.ps1 b/Src/Private/Get-AbrDomainSection.ps1
@@ -88,25 +88,25 @@ function Get-AbrDomainSection {
                                                     }
                                                 }
                                             }
-                                            if ($HealthCheck.DomainController.Diagnostic) {
-                                                try {
-                                                    $DCDiagObj = foreach ($DC in $DCs) {
-                                                        if (Get-DCWinRMState -ComputerName $DC -DCStatus ([ref]$DCStatus)) {
-                                                            Get-AbrADDCDiag -Domain $Domain -DC $DC
-                                                        }
-                                                    }
-                                                    if ($DCDiagObj) {
-                                                        Section -Style Heading4 'DC Diagnostic' {
-                                                            Paragraph "The following section provides a summary of the Active Directory DC Diagnostic."
-                                                            BlankLine
-                                                            $DCDiagObj
-                                                        }
-                                                    }
-                                                } catch {
-                                                    Write-PScriboMessage -IsWarning "Error: Connecting to remote server $DC failed: WinRM cannot complete the operation. ('DCDiag Information)"
-                                                    Write-PScriboMessage -IsWarning $_.Exception.Message
-                                                }
-                                            }
+                                            # if ($HealthCheck.DomainController.Diagnostic) {
+                                            #     try {
+                                            #         $DCDiagObj = foreach ($DC in $DCs) {
+                                            #             if (Get-DCWinRMState -ComputerName $DC -DCStatus ([ref]$DCStatus)) {
+                                            #                 Get-AbrADDCDiag -Domain $Domain -DC $DC
+                                            #             }
+                                            #         }
+                                            #         if ($DCDiagObj) {
+                                            #             Section -Style Heading4 'DC Diagnostic' {
+                                            #                 Paragraph "The following section provides a summary of the Active Directory DC Diagnostic."
+                                            #                 BlankLine
+                                            #                 $DCDiagObj
+                                            #             }
+                                            #         }
+                                            #     } catch {
+                                            #         Write-PScriboMessage -IsWarning "Error: Connecting to remote server $DC failed: WinRM cannot complete the operation. ('DCDiag Information)"
+                                            #         Write-PScriboMessage -IsWarning $_.Exception.Message
+                                            #     }
+                                            # }
                                             try {
                                                 $ADInfraServices = foreach ($DC in $DCs) {
                                                     if (Get-DCWinRMState -ComputerName $DC -DCStatus ([ref]$DCStatus)) {
diff --git a/Src/Private/Invoke-CommandWithTimeout.ps1 b/Src/Private/Invoke-CommandWithTimeout.ps1
@@ -46,6 +46,10 @@ function Invoke-CommandWithTimeout {
         [int]$TimeoutSeconds = $Options.JobsTimeOut
     )
 
+    if (-not $TimeoutSeconds) {
+        $TimeoutSeconds = 900
+    }
+
     # Start the command as a job
     $job = Invoke-Command -Session $Session -ScriptBlock $ScriptBlock -AsJob
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ function Invoke-CommandWithTimeout {`
`46`	`46`	`[int]$TimeoutSeconds = $Options.JobsTimeOut`
`47`	`47`	`)`
`48`	`48`
	`49`	`+ if (-not $TimeoutSeconds) {`
	`50`	`+ $TimeoutSeconds = 900`
	`51`	`+ }`
	`52`	`+`
`49`	`53`	`# Start the command as a job`
`50`	`54`	`$job = Invoke-Command -Session $Session -ScriptBlock $ScriptBlock -AsJob`
`51`	`55`