Merge pull request KelvinTegelaar#1163 from JohnDuprey/dev

JohnDuprey · web-flow · commit 9f82116f895d · 2024-10-23T16:24:39.000-04:00
entrypoint tweaks
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1
@@ -103,6 +103,7 @@ function Receive-CippOrchestrationTrigger {
         }
 
         if (($Batch | Measure-Object).Count -gt 0) {
+            Write-Information "Batch Count: $($Batch.Count)"
             $Tasks = foreach ($Item in $Batch) {
                 $DurableActivity = @{
                     FunctionName = 'CIPPActivityFunction'
@@ -113,7 +114,7 @@ function Receive-CippOrchestrationTrigger {
                 }
                 Invoke-DurableActivity @DurableActivity
             }
-            if ($NoWait) {
+            if ($NoWait -and $Tasks) {
                 $null = Wait-ActivityFunction -Task $Tasks
             }
         }
@@ -152,7 +153,7 @@ function Receive-CippActivityTrigger {
         if ($Item.FunctionName) {
             $FunctionName = 'Push-{0}' -f $Item.FunctionName
             try {
-                & $FunctionName -Item $Item
+                Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }
 
                 if ($TaskStatus) {
                     $QueueTask.Status = 'Completed'

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ function Receive-CippOrchestrationTrigger {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if (($Batch \| Measure-Object).Count -gt 0) {`
	`106`	`+ Write-Information "Batch Count: $($Batch.Count)"`
`106`	`107`	`$Tasks = foreach ($Item in $Batch) {`
`107`	`108`	`$DurableActivity = @{`
`108`	`109`	`FunctionName = 'CIPPActivityFunction'`
`@@ -113,7 +114,7 @@ function Receive-CippOrchestrationTrigger {`
`113`	`114`	`}`
`114`	`115`	`Invoke-DurableActivity @DurableActivity`
`115`	`116`	`}`
`116`		`- if ($NoWait) {`
	`117`	`+ if ($NoWait -and $Tasks) {`
`117`	`118`	`$null = Wait-ActivityFunction -Task $Tasks`
`118`	`119`	`}`
`119`	`120`	`}`
`@@ -152,7 +153,7 @@ function Receive-CippActivityTrigger {`
`152`	`153`	`if ($Item.FunctionName) {`
`153`	`154`	`$FunctionName = 'Push-{0}' -f $Item.FunctionName`
`154`	`155`	`try {`
`155`		`- & $FunctionName -Item $Item`
	`156`	`+ Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }`
`156`	`157`
`157`	`158`	`if ($TaskStatus) {`
`158`	`159`	`$QueueTask.Status = 'Completed'`