CR fixess

Slickdeals · Aug 19, 2019 · 600ac06 · 600ac06
1 parent a943592
commit 600ac06
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/docs/bundle/async_commands.md b/docs/bundle/async_commands.md
@@ -24,7 +24,8 @@ enqueue:
         async_commands:
             enabled: true
             timeout: 60
-            prefix: ~
+            command_name: ~
+            queue_name: ~
 ```
 
 ## Usage

diff --git a/docs/bundle/config_reference.md b/docs/bundle/config_reference.md
@@ -63,7 +63,8 @@ enqueue:
         async_commands:
             enabled:              false
             timeout:              60
-            prefix: ~
+            command_name:         ~
+            queue_name:           ~
         job:
             enabled:              false
         async_events:

diff --git a/pkg/async-command/DependencyInjection/AsyncCommandExtension.php b/pkg/async-command/DependencyInjection/AsyncCommandExtension.php
@@ -16,7 +16,8 @@ public function load(array $configs, ContainerBuilder $container)
             if (!is_array($client)) {
                 $client = [
                     'name' => $client,
-                    'prefix' => '',
+                    'command_name' => Commands::RUN_COMMAND,
+                    'queue_name' => Commands::RUN_COMMAND,
                     'timeout' => 60,
                 ];
             }
@@ -26,8 +27,8 @@ public function load(array $configs, ContainerBuilder $container)
                 ->addArgument('%kernel.project_dir%', $client['timeout'])
                 ->addTag('enqueue.processor', [
                     'client' => $client['name'],
-                    'command' => $client['prefix'].Commands::RUN_COMMAND,
-                    'queue' => $client['prefix'].Commands::RUN_COMMAND,
+                    'command' => $client['command_name'] ?? Commands::RUN_COMMAND,
+                    'queue' => $client['queue_name'] ?? Commands::RUN_COMMAND,
                     'prefix_queue' => false,
                     'exclusive' => true,
                 ])

diff --git a/pkg/enqueue-bundle/DependencyInjection/Configuration.php b/pkg/enqueue-bundle/DependencyInjection/Configuration.php
@@ -76,7 +76,8 @@ private function getAsyncCommandsConfiguration(): ArrayNodeDefinition
             ->children()
                 ->booleanNode('enabled')->defaultFalse()->end()
                 ->integerNode('timeout')->min(0)->defaultValue(60)->end()
-                ->scalarNode('prefix')->defaultValue('')->end()
+                ->scalarNode('command_name')->defaultNull()->end()
+                ->scalarNode('queue_name')->defaultNull()->end()
             ->end()
             ->addDefaultsIfNotSet()
             ->canBeEnabled()

diff --git a/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php b/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php
@@ -297,7 +297,8 @@ private function loadAsyncCommands(array $config, ContainerBuilder $container):
                 $configs[] = [
                     'name' => $name,
                     'timeout' => $modules['async_commands']['timeout'],
-                    'prefix' => $modules['async_commands']['prefix'],
+                    'command_name' => $modules['async_commands']['command_name'],
+                    'queue_name' => $modules['async_commands']['queue_name'],
                 ];
             }
         }

diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
@@ -31,7 +31,8 @@ enqueue:
         async_commands:
             enabled: true
             timeout: 60
-            prefix: ''
+            command_name: ~
+            queue_name: ~
 
 services:
     test_enqueue.client.default.traceable_producer: