fix(BatchProcess): show interrupt message only once (#120)

* fix(`BatchProcess`): show interrupt message only once * fix
rekalogika · Jul 15, 2024 · bb2205c · bb2205c
1 parent d85ccaa
commit bb2205c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * feat: add `BatchProcess` and related classes
 * feat(`BatchProcess`): add `SimpleBatchProcess`, simplify wiring, add
   process-file feature
+* fix(`BatchProcess`): show interrupt message only once
 
 # 0.13.0
 

diff --git a/packages/rekapager-core/src/Batch/BatchProcess.php b/packages/rekapager-core/src/Batch/BatchProcess.php
@@ -46,9 +46,15 @@ public function __construct(
         $this->logger = $logger ?? new NullLogger();
     }
 
-    final public function stop(): void
+    final public function stop(): bool
     {
-        $this->stopFlag = true;
+        if ($this->stopFlag === false) {
+            $this->stopFlag = true;
+
+            return true;
+        }
+
+        return false;
     }
 
     /**

diff --git a/packages/rekapager-symfony-bridge/src/BatchCommand.php b/packages/rekapager-symfony-bridge/src/BatchCommand.php
@@ -13,7 +13,6 @@
 
 namespace Rekalogika\Rekapager\Symfony;
 
-use Doctrine\DBAL\Driver\PgSQL\Exception\UnexpectedValue;
 use Rekalogika\Contracts\Rekapager\Exception\InvalidArgumentException;
 use Rekalogika\Contracts\Rekapager\Exception\LogicException;
 use Rekalogika\Contracts\Rekapager\Exception\UnexpectedValueException;
@@ -103,7 +102,7 @@ final protected function execute(InputInterface $input, OutputInterface $output)
         if ($progressFile !== null && file_exists($progressFile) && $resume === null) {
             $resume = file_get_contents($progressFile);
 
-            if (!is_string($resume)) {
+            if (!\is_string($resume)) {
                 throw new UnexpectedValueException(sprintf('Invalid resume data in progress file "%s"', $progressFile));
             }
         }
@@ -143,9 +142,11 @@ public function handleSignal(int $signal, int|false $previousExitCode = 0): int|
             return false;
         }
 
-        $this->io?->warning('Interrupt received, stopping batch processing');
+        $result = (bool) $this->batchProcess?->stop();
 
-        $this->batchProcess?->stop();
+        if ($result === true) {
+            $this->io?->warning('Interrupt received, stopping batch processing');
+        }
 
         return false;
     }