Skip to content

Commit 9f575f4

Browse files
committed
MC-35985: Enable new consumer configuration settings on current consumers
- Update handling onlySpawnWhenMessageAvailable attribute;
1 parent cc95088 commit 9f575f4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,12 @@ private function canBeRun(ConsumerConfigItemInterface $consumerConfig, array $al
176176
return false;
177177
}
178178

179-
$onlySpawnWhenMessageAvailable = (bool)$this->deploymentConfig->get(
179+
$globalOnlySpawnWhenMessageAvailable = (bool)$this->deploymentConfig->get(
180180
'queue/only_spawn_when_message_available',
181-
0
181+
true
182182
);
183-
if ($onlySpawnWhenMessageAvailable || $consumerConfig->getOnlySpawnWhenMessageAvailable()) {
183+
if ($consumerConfig->getOnlySpawnWhenMessageAvailable() === true
184+
|| ($consumerConfig->getOnlySpawnWhenMessageAvailable() === null && $globalOnlySpawnWhenMessageAvailable)) {
184185
try {
185186
return $this->checkIsAvailableMessages->execute(
186187
$connectionName,

lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private function getConsumerConfigDataFromQueueConfig()
7171
'maxMessages' => $consumerData['max_messages'],
7272
'maxIdleTime' => null,
7373
'sleep' => null,
74-
'onlySpawnWhenMessageAvailable' => false
74+
'onlySpawnWhenMessageAvailable' => null
7575
];
7676
}
7777

lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function convert($source)
7777
'maxIdleTime' => $this->getAttributeValue($consumerNode, 'maxIdleTime'),
7878
'sleep' => $this->getAttributeValue($consumerNode, 'sleep'),
7979
'onlySpawnWhenMessageAvailable' =>
80-
$onlySpawnWhenMessageAvailable === 'false' ? false : boolval($onlySpawnWhenMessageAvailable)
80+
$onlySpawnWhenMessageAvailable === null ? null : boolval($onlySpawnWhenMessageAvailable)
8181
];
8282
}
8383
return $result;

0 commit comments

Comments
 (0)