Skip to content

Commit e1b58fc

Browse files
fixes for queues etc
1 parent dc17d03 commit e1b58fc

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

CIPPTimer/function.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
"name": "starter",
1313
"type": "durableClient",
1414
"direction": "in"
15+
},
16+
{
17+
"type": "queue",
18+
"direction": "out",
19+
"name": "QueueItem",
20+
"queueName": "cippqueue"
1521
}
1622
]
1723
}

Modules/CIPPCore/Public/Get-CIPPTimerFunctions.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Get-CIPPTimerFunctions {
1414

1515
$FunctionName = $env:WEBSITE_SITE_NAME
1616
$MainFunctionVersion = ($Nodes | Where-Object { $_.RowKey -eq $FunctionName }).Version
17-
$AvailableNodes = $Nodes.RowKey | Where-Object { $_.RowKey -match '-' -and $_.Version -eq $MainFunctionVersion } | ForEach-Object { ($_ -split '-')[1] }
17+
$AvailableNodes = $Nodes | Where-Object { $_.RowKey -match '-' -and $_.Version -eq $MainFunctionVersion } | ForEach-Object { ($_.RowKey -split '-')[1] }
1818

1919
# Get node name
2020
if ($FunctionName -match '-') {
@@ -131,7 +131,7 @@ function Get-CIPPTimerFunctions {
131131
}
132132
$Status.NextOccurrence = $NextOccurrence.ToUniversalTime()
133133
$PreferredProcessor = $Orchestrator.PreferredProcessor ?? ''
134-
if ($Status.PSObject.Properites.Name -notcontains 'PreferredProcessor') {
134+
if ($Status.PSObject.Properties.Name -notcontains 'PreferredProcessor') {
135135
$Status | Add-Member -MemberType NoteProperty -Name 'PreferredProcessor' -Value $PreferredProcessor -Force
136136
} else {
137137
$Status.PreferredProcessor = $PreferredProcessor

Modules/CippEntrypoints/CippEntrypoints.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ function Receive-CIPPTimerTrigger {
542542

543543
# Wrap the timer function execution with telemetry
544544

545-
Invoke-Command -ScriptBlock { & $Function.Command @Parameters }
545+
$Results = Invoke-Command -ScriptBlock { & $Function.Command @Parameters }
546546

547547

548548
if ($Results -match '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$') {

host.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"functionTimeout": "00:10:00",
1111
"extensions": {
1212
"durableTask": {
13-
"maxConcurrentActivityFunctions": 5,
14-
"maxConcurrentOrchestratorFunctions": 1,
13+
"maxConcurrentActivityFunctions": 10,
14+
"maxConcurrentOrchestratorFunctions": 5,
1515
"tracing": {
1616
"distributedTracingEnabled": false,
1717
"version": "None"

0 commit comments

Comments
 (0)