Add --isolated flag to command

laravel · Oct 28, 2022 · b074952 · b074952
1 parent 04a9a4b
commit b074952
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/Illuminate/Console/Command.php b/src/Illuminate/Console/Command.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Traits\Macroable;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Command extends SymfonyCommand
@@ -87,6 +88,15 @@ public function __construct()
         if (! isset($this->signature)) {
             $this->specifyParameters();
         }
+
+        if ($this instanceof Isolated) {
+            $this->getDefinition()->addOption(new InputOption(
+                'isolated',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Limits the command to only have one instance running at once'
+            ));
+        }
     }
 
     /**
@@ -140,7 +150,7 @@ public function run(InputInterface $input, OutputInterface $output): int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if ($this instanceof Isolated && ! $this->mutex()->create($this)) {
+        if ($this instanceof Isolated && $this->option('isolated') && ! $this->mutex()->create($this)) {
             $this->info(sprintf(
                 'Skipping [%s], as command already running.', $this->getName()
             ));
@@ -153,7 +163,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             return (int) $this->laravel->call([$this, $method]);
         } finally {
-            if ($this instanceof Isolated) {
+            if ($this instanceof Isolated && $this->option('isolated')) {
                 $this->mutex()->release($this);
             }
         }

diff --git a/tests/Console/CommandMutexTest.php b/tests/Console/CommandMutexTest.php
@@ -82,9 +82,18 @@ public function testCanRunCommandAgainAfterOtherCommandFinished()
         $this->assertEquals(2, $this->command->ran);
     }
 
-    protected function runCommand()
+    public function testCanRunCommandAgainNonAutomated()
     {
-        $input = new ArrayInput([]);
+        $this->commandMutex->shouldNotHaveBeenCalled();
+
+        $this->runCommand(false);
+
+        $this->assertEquals(1, $this->command->ran);
+    }
+
+    protected function runCommand($withIsolated = true)
+    {
+        $input = new ArrayInput(['--isolated' => $withIsolated]);
         $output = new NullOutput;
         $this->command->run($input, $output);
     }