Async commands extended

Author: uro

DependencyInjection/AsyncCommandExtension.php

@@ -12,13 +12,22 @@ class AsyncCommandExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         foreach ($configs['clients'] as $client) {
-            $id = sprintf('enqueue.async_command.%s.run_command_processor', $client);
+            // BC compatibility
+            if (!is_array($client)) {
+                $client = [
+                    'name' => $client,
+                    'prefix' => '',
+                    'timeout' => 60,
+                ];
+            }
+
+            $id = sprintf('enqueue.async_command.%s.run_command_processor', $client['name']);
             $container->register($id, RunCommandProcessor::class)
-                ->addArgument('%kernel.project_dir%')
+                ->addArgument('%kernel.project_dir%', $client['timeout'])
                 ->addTag('enqueue.processor', [
-                    'client' => $client,
-                    'command' => Commands::RUN_COMMAND,
-                    'queue' => Commands::RUN_COMMAND,
+                    'client' => $client['name'],
+                    'command' => $client['prefix'].Commands::RUN_COMMAND,
+                    'queue' => $client['prefix'].Commands::RUN_COMMAND,
                     'prefix_queue' => false,
                     'exclusive' => true,
                 ])

RunCommandProcessor.php

@@ -11,14 +11,20 @@
 
 final class RunCommandProcessor implements Processor
 {
+    /**
+     * @var int
+     */
+    private $timeout;
+
     /**
      * @var string
      */
     private $projectDir;
 
-    public function __construct(string $projectDir)
+    public function __construct(string $projectDir, int $timeout = 60)
     {
         $this->projectDir = $projectDir;
+        $this->timeout = $timeout;
     }
 
     public function process(Message $message, Context $context): Result
@@ -29,7 +35,7 @@ public function process(Message $message, Context $context): Result
         $consoleBin = file_exists($this->projectDir.'/bin/console') ? './bin/console' : './app/console';
 
         $process = new Process($phpBin.' '.$consoleBin.' '.$this->getCommandLine($command), $this->projectDir);
-
+        $process->setTimeout($this->timeout);
         $process->run();
 
         if ($message->getReplyTo()) {

Tests/RunCommandProcessorTest.php

@@ -28,4 +28,11 @@ public function testCouldBeConstructedWithProjectDirAsFirstArgument()
 
         $this->assertAttributeSame('aProjectDir', 'projectDir', $processor);
     }
+
+    public function testCouldBeConstructedWithTimeoutAsSecondArgument()
+    {
+        $processor = new RunCommandProcessor('aProjectDir', 60);
+
+        $this->assertAttributeSame(60, 'timeout', $processor);
+    }
 }