Merge pull request #1180 from JohnDuprey/dev

timer tweaks
KelvinTegelaar · Nov 13, 2024 · cf738e1 · cf738e1
2 parents 4e4491c + 6362279
commit cf738e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1
@@ -39,6 +39,7 @@ function Start-DurableCleanup {
             Write-Information "Orchestrator: $($Orchestrator.PartitionKey), created: $CreatedTime, running for: $RunningDuration minutes"
             $ClearQueues = $true
             if ($PSCmdlet.ShouldProcess($_.PartitionKey, 'Terminate Orchestrator')) {
+                $Orchestrator = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq '$($Orchestrator.PartitionKey)'"
                 $Orchestrator.RuntimeStatus = 'Failed'
                 Update-AzDataTableEntity @Table -Entity $Orchestrator
                 $CleanupCount++

diff --git a/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1 b/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1
@@ -60,6 +60,7 @@ function Set-CIPPGDAPInviteGroups {
                 #Write-Information ($InputObject | ConvertTo-Json)
                 $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject (ConvertTo-Json -InputObject $InputObject -Depth 5 -Compress)
                 Write-Information "Started GDAP Invite orchestration with ID = '$InstanceId'"
+                return $InstanceId
             }
         }
     }