Skip to content

Commit 120a71d

Browse files
sidolovsidolov
authored
Merge branch '2.4-develop' into 2.4-develop-prs
2 parents 64cae2f + 4cc763c commit 120a71d

File tree

77 files changed

+405
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+405
-248
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Helper/FileAssertions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public function assertDirectoryNotEmpty($path, $message = ''): void
297297
* @param string $filePathJson - path to file or json structure with paths by storage type.
298298
* @return mixed
299299
*/
300-
private function extractFilePath($filePathJson)
300+
public function extractFilePath($filePathJson)
301301
{
302302
$filePathArgs = json_decode($filePathJson, true);
303303
if (isset($filePathArgs[$this->storageType])) {

‎app/code/Magento/Catalog/etc/queue.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
9-
<broker topic="product_action_attribute.update" exchange="magento-db" type="db">
10-
<queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
9+
<broker topic="product_action_attribute.update" exchange="magento">
10+
<queue name="product_action_attribute.update" consumer="product_action_attribute.update" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
1111
</broker>
12-
<broker topic="product_action_attribute.website.update" exchange="magento-db" type="db">
13-
<queue name="product_action_attribute.website.update" consumer="product_action_attribute.website.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process"/>
12+
<broker topic="product_action_attribute.website.update" exchange="magento">
13+
<queue name="product_action_attribute.website.update" consumer="product_action_attribute.website.update" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process"/>
1414
</broker>
15-
</config>
15+
</config>

‎app/code/Magento/Catalog/etc/queue_consumer.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
9-
<consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
10-
<consumer name="product_action_attribute.website.update" queue="product_action_attribute.website.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process" />
11-
</config>
9+
<consumer name="product_action_attribute.update" queue="product_action_attribute.update" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
10+
<consumer name="product_action_attribute.website.update" queue="product_action_attribute.website.update" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process" />
11+
</config>

‎app/code/Magento/Catalog/etc/queue_publisher.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
9-
<publisher topic="product_action_attribute.update">
10-
<connection name="db" exchange="magento-db" />
11-
</publisher>
12-
<publisher topic="product_action_attribute.website.update">
13-
<connection name="db" exchange="magento-db" />
14-
</publisher>
15-
</config>
9+
<publisher topic="product_action_attribute.update"/>
10+
<publisher topic="product_action_attribute.website.update"/>
11+
</config>

‎app/code/Magento/Catalog/etc/queue_topology.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
9-
<exchange name="magento-db" type="topic" connection="db">
10-
<binding id="updateBinding" topic="product_action_attribute.update" destinationType="queue" destination="product_action_attribute.update"/>
11-
<binding id="updateBindingWebsite" topic="product_action_attribute.website.update" destinationType="queue" destination="product_action_attribute.website.update"/>
9+
<exchange name="magento">
10+
<binding id="updateBinding" topic="product_action_attribute.update" destination="product_action_attribute.update"/>
11+
<binding id="updateBindingWebsite" topic="product_action_attribute.website.update" destination="product_action_attribute.website.update"/>
1212
</exchange>
13-
</config>
13+
</config>

‎app/code/Magento/ImportExport/etc/queue.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
9-
<broker topic="import_export.export" exchange="magento-db" type="db">
10-
<queue name="export" consumer="exportProcessor" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\ImportExport\Model\Export\Consumer::process"/>
9+
<broker topic="import_export.export" exchange="magento">
10+
<queue name="export" consumer="exportProcessor" handler="Magento\ImportExport\Model\Export\Consumer::process"/>
1111
</broker>
1212
</config>

‎app/code/Magento/ImportExport/etc/queue_consumer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
9-
<consumer name="exportProcessor" queue="export" connection="db" maxMessages="100" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\ImportExport\Model\Export\Consumer::process" />
9+
<consumer name="exportProcessor" queue="export" handler="Magento\ImportExport\Model\Export\Consumer::process" />
1010
</config>

‎app/code/Magento/ImportExport/etc/queue_publisher.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
9-
<publisher topic="import_export.export">
10-
<connection name="db" exchange="magento-db" />
11-
</publisher>
9+
<publisher topic="import_export.export"/>
1210
</config>

‎app/code/Magento/ImportExport/etc/queue_topology.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
9-
<exchange name="magento-db" type="topic" connection="db">
10-
<binding id="exportBinding" topic="import_export.export" destinationType="queue" destination="export"/>
9+
<exchange name="magento">
10+
<binding id="exportBinding" topic="import_export.export" destination="export"/>
1111
</exchange>
1212
</config>

‎app/code/Magento/MediaContentSynchronization/etc/queue.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
9-
<broker topic="media.content.synchronization" exchange="magento-db" type="db">
10-
<queue name="media.content.synchronization" consumer="media.content.synchronization" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\MediaContentSynchronization\Model\Consume::execute" />
9+
<broker topic="media.content.synchronization" exchange="magento">
10+
<queue name="media.content.synchronization" consumer="media.content.synchronization" handler="Magento\MediaContentSynchronization\Model\Consume::execute" />
1111
</broker>
1212
</config>

0 commit comments

Comments
 (0)