From 7107c8295452b8e7592730154f826576cee2aa60 Mon Sep 17 00:00:00 2001 From: Maksym Khartanovych Date: Mon, 9 Mar 2020 18:31:47 +0200 Subject: [PATCH 1/5] Allow configurable processor prefix queue --- DependencyInjection/Configuration.php | 5 ++++- DependencyInjection/EnqueueElasticaExtension.php | 1 + Queue/PopulateProcessor.php | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 53a1347..2ce0012 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -12,7 +12,7 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - + $tb = new TreeBuilder('enqueue_elastica'); if (method_exists($tb, 'getRootNode')) { $rootNode = $tb->getRootNode(); @@ -24,6 +24,9 @@ public function getConfigTreeBuilder() ->children() ->booleanNode('enabled')->defaultValue(true)->end() ->scalarNode('transport')->defaultValue('%enqueue.default_transport%')->cannotBeEmpty()->isRequired()->end() + ->arrayNode('processor') + ->children() + ->booleanNode('prefix_queue')->defaultFalse()->end() ->arrayNode('doctrine') ->children() ->scalarNode('driver')->defaultValue('orm')->cannotBeEmpty() diff --git a/DependencyInjection/EnqueueElasticaExtension.php b/DependencyInjection/EnqueueElasticaExtension.php index d717cdf..1d78b62 100644 --- a/DependencyInjection/EnqueueElasticaExtension.php +++ b/DependencyInjection/EnqueueElasticaExtension.php @@ -34,6 +34,7 @@ public function load(array $configs, ContainerBuilder $container) $container->register('enqueue_elastica.populate_processor', PopulateProcessor::class) ->addArgument(new Reference('fos_elastica.pager_provider_registry')) ->addArgument(new Reference('fos_elastica.pager_persister_registry')) + ->addArgument($config['processor']) ->addTag('enqueue.command_subscriber', ['client' => $transport]) ->addTag('enqueue.transport.processor', ['transport' => $transport]) diff --git a/Queue/PopulateProcessor.php b/Queue/PopulateProcessor.php index 3951a6c..eef01d1 100644 --- a/Queue/PopulateProcessor.php +++ b/Queue/PopulateProcessor.php @@ -18,12 +18,17 @@ final class PopulateProcessor implements Processor, CommandSubscriberInterface, private $pagerPersisterRegistry; + /** @var array */ + private static $config = []; + public function __construct( PagerProviderRegistry $pagerProviderRegistry, - PagerPersisterRegistry $pagerPersisterRegistry + PagerPersisterRegistry $pagerPersisterRegistry, + array $config ) { $this->pagerPersisterRegistry = $pagerPersisterRegistry; $this->pagerProviderRegistry = $pagerProviderRegistry; + self::$config = $config; } public function process(Message $message, Context $context): Result @@ -102,7 +107,7 @@ public static function getSubscribedCommand(): array return [ 'command' => Commands::POPULATE, 'queue' => Commands::POPULATE, - 'prefix_queue' => false, + 'prefix_queue' => self::$config['prefix_queue'], 'exclusive' => true, ]; } From 4ed0e5a76e095da41f1cb351665261f77a9fc8c8 Mon Sep 17 00:00:00 2001 From: Maksym Khartanovych Date: Mon, 9 Mar 2020 19:13:06 +0200 Subject: [PATCH 2/5] Set processor prefix queue to true --- DependencyInjection/Configuration.php | 3 --- DependencyInjection/EnqueueElasticaExtension.php | 1 - Queue/PopulateProcessor.php | 9 ++------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 2ce0012..c032370 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -24,9 +24,6 @@ public function getConfigTreeBuilder() ->children() ->booleanNode('enabled')->defaultValue(true)->end() ->scalarNode('transport')->defaultValue('%enqueue.default_transport%')->cannotBeEmpty()->isRequired()->end() - ->arrayNode('processor') - ->children() - ->booleanNode('prefix_queue')->defaultFalse()->end() ->arrayNode('doctrine') ->children() ->scalarNode('driver')->defaultValue('orm')->cannotBeEmpty() diff --git a/DependencyInjection/EnqueueElasticaExtension.php b/DependencyInjection/EnqueueElasticaExtension.php index 1d78b62..d717cdf 100644 --- a/DependencyInjection/EnqueueElasticaExtension.php +++ b/DependencyInjection/EnqueueElasticaExtension.php @@ -34,7 +34,6 @@ public function load(array $configs, ContainerBuilder $container) $container->register('enqueue_elastica.populate_processor', PopulateProcessor::class) ->addArgument(new Reference('fos_elastica.pager_provider_registry')) ->addArgument(new Reference('fos_elastica.pager_persister_registry')) - ->addArgument($config['processor']) ->addTag('enqueue.command_subscriber', ['client' => $transport]) ->addTag('enqueue.transport.processor', ['transport' => $transport]) diff --git a/Queue/PopulateProcessor.php b/Queue/PopulateProcessor.php index eef01d1..dd2e4df 100644 --- a/Queue/PopulateProcessor.php +++ b/Queue/PopulateProcessor.php @@ -18,17 +18,12 @@ final class PopulateProcessor implements Processor, CommandSubscriberInterface, private $pagerPersisterRegistry; - /** @var array */ - private static $config = []; - public function __construct( PagerProviderRegistry $pagerProviderRegistry, - PagerPersisterRegistry $pagerPersisterRegistry, - array $config + PagerPersisterRegistry $pagerPersisterRegistry ) { $this->pagerPersisterRegistry = $pagerPersisterRegistry; $this->pagerProviderRegistry = $pagerProviderRegistry; - self::$config = $config; } public function process(Message $message, Context $context): Result @@ -107,7 +102,7 @@ public static function getSubscribedCommand(): array return [ 'command' => Commands::POPULATE, 'queue' => Commands::POPULATE, - 'prefix_queue' => self::$config['prefix_queue'], + 'prefix_queue' => true, 'exclusive' => true, ]; } From 70a6d180c88d209ee29fa373f7f3cbeedb02a57c Mon Sep 17 00:00:00 2001 From: Maksym Khartanovych Date: Mon, 9 Mar 2020 19:26:58 +0200 Subject: [PATCH 3/5] Set processor prefix queue to true --- DependencyInjection/Configuration.php | 1 - 1 file changed, 1 deletion(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index c032370..7912b84 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -12,7 +12,6 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $tb = new TreeBuilder('enqueue_elastica'); if (method_exists($tb, 'getRootNode')) { $rootNode = $tb->getRootNode(); From ad16f72828278c4856df2dd1d6a92f16bdd2102d Mon Sep 17 00:00:00 2001 From: bilyuk Date: Fri, 12 Aug 2022 16:52:51 +0200 Subject: [PATCH 4/5] update friendsofsymfony/elastica-bundle --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7391d3d..d01b0a5 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "php": "^7.1", "symfony/framework-bundle": "^3.4|^4", - "friendsofsymfony/elastica-bundle": "^5", + "friendsofsymfony/elastica-bundle": "^friendsofsymfony/elastica-bundle", "enqueue/enqueue-bundle": "^0.9" }, "autoload": { From c7646d0c6a8f4b8d734b2ddbacd2f24d3689c92c Mon Sep 17 00:00:00 2001 From: bilyuk Date: Fri, 12 Aug 2022 16:55:08 +0200 Subject: [PATCH 5/5] update friendsofsymfony/elastica-bundle --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d01b0a5..3fd54c7 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "php": "^7.1", "symfony/framework-bundle": "^3.4|^4", - "friendsofsymfony/elastica-bundle": "^friendsofsymfony/elastica-bundle", + "friendsofsymfony/elastica-bundle": "6.0.0-beta5", "enqueue/enqueue-bundle": "^0.9" }, "autoload": {