durable cleanup fix part 2

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1

@@ -26,16 +26,13 @@ function Start-DurableCleanup {
 
     $CleanupCount = 0
     $QueueCount = 0
-    $ClearQueues = $false
 
     $FunctionsWithLongRunningOrchestrators = [System.Collections.Generic.List[object]]::new()
     foreach ($Table in $InstancesTables) {
-        $RunningOrchestratorCount = 0
         $Table = Get-CippTable -TableName $Table
         $FunctionName = $Table.TableName -replace 'Instances', ''
         $Orchestrators = Get-CIPPAzDataTableEntity @Table -Filter "RuntimeStatus eq 'Running'" | Select-Object * -ExcludeProperty Input
         $Queues = Get-AzStorageQueue -Context $StorageContext -Name ('{0}*' -f $FunctionName) | Select-Object -Property Name, ApproximateMessageCount, QueueClient
-        $RunningOrchestratorCount = $Orchestrators.Count
         $LongRunningOrchestrators = $Orchestrators | Where-Object { $_.CreatedTime.DateTime -lt $TargetTime }
         if ($LongRunningOrchestrators.Count -gt 0) {
             $FunctionsWithLongRunningOrchestrators.Add(@{'FunctionName' = $FunctionName })
@@ -45,7 +42,6 @@ function Start-DurableCleanup {
             $TimeSpan = New-TimeSpan -Start $CreatedTime -End (Get-Date).ToUniversalTime()
             $RunningDuration = [math]::Round($TimeSpan.TotalMinutes, 2)
             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'
@@ -58,7 +54,7 @@ function Start-DurableCleanup {
                 $CleanupCount++
             }
         }
-        if ($ClearQueues -or ($RunningOrchestratorCount -eq 0 -and $Queues.ApproximateMessageCount -gt 0)) {
+        if ($LongRunningOrchestrators.Count -gt 0 -and $Queues.ApproximateMessageCount -gt 0) {
             $RunningQueues = $Queues | Where-Object { $_.ApproximateMessageCount -gt 0 }
             foreach ($Queue in $RunningQueues) {
                 Write-Information "- Removing queue: $($Queue.Name), message count: $($Queue.ApproximateMessageCount)"