Skip to content

Commit 11d93a6

Browse files
committed
fix(core): duplicate queue warning covers the combined limit
Two definitions of the same queue that differ only in combinedConcurrencyLimit now warn and keep the first definition instead of letting registration order pick the deployed cap.
1 parent 2f0c248 commit 11d93a6

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

packages/core/src/v3/resource-catalog/standardResourceCatalog.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,26 @@ export class StandardResourceCatalog implements ResourceCatalog {
7171
registerQueueMetadata(queue: QueueManifest): void {
7272
const existingQueue = this._queueMetadata.get(queue.name);
7373

74-
//if it exists already AND concurrencyLimit is different, log a warning
74+
//if it exists already with different settings, log a warning and keep the first definition
7575
if (existingQueue) {
7676
const isConcurrencyLimitDifferent = existingQueue.concurrencyLimit !== queue.concurrencyLimit;
77+
const isCombinedLimitDifferent =
78+
existingQueue.combinedConcurrencyLimit !== queue.combinedConcurrencyLimit;
7779

78-
if (isConcurrencyLimitDifferent) {
80+
if (isConcurrencyLimitDifferent || isCombinedLimitDifferent) {
7981
let message = `Queue "${queue.name}" is defined twice, with different settings.`;
8082
if (isConcurrencyLimitDifferent) {
8183
message += `\n - concurrencyLimit: ${existingQueue.concurrencyLimit} vs ${queue.concurrencyLimit}`;
8284
}
85+
if (isCombinedLimitDifferent) {
86+
message += `\n - combinedConcurrencyLimit: ${existingQueue.combinedConcurrencyLimit} vs ${queue.combinedConcurrencyLimit}`;
87+
}
8388

8489
message += "\n Keeping the first definition:";
8590
message += `\n - concurrencyLimit: ${existingQueue.concurrencyLimit}`;
91+
if (existingQueue.combinedConcurrencyLimit != null) {
92+
message += `\n - combinedConcurrencyLimit: ${existingQueue.combinedConcurrencyLimit}`;
93+
}
8694
console.warn(message);
8795
return;
8896
}

0 commit comments

Comments
 (0)