feat: refresh entity before set to stale

whatwedo · Aug 22, 2023 · e07f3db · e07f3db
1 parent fcc782e
commit e07f3db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Command/CheckCommand.php b/src/Command/CheckCommand.php
@@ -45,7 +45,7 @@ public function __construct(protected ExecutionManager $executionManager)
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->executionManager->check();
+        $this->executionManager->check(15);
 
         return Command::SUCCESS;
     }

diff --git a/src/Command/ExecuteCommand.php b/src/Command/ExecuteCommand.php
@@ -97,6 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // Create execution
         $execution = new Execution();
         $execution->setJob($cronJob::class)
+            ->setState(Execution::STATE_RUNNING)
             ->setCommand($command);
         $this->entityManager->persist($execution);
         $this->entityManager->flush($execution);

diff --git a/src/Manager/ExecutionManager.php b/src/Manager/ExecutionManager.php
@@ -177,11 +177,14 @@ protected function cleanupStale(): void
         foreach ($executions as $execution) {
             $this->logger->debug(sprintf('Checking execution state with id %d. (%s)', $execution->getPid(), $execution->getJob()));
             if (! posix_kill($execution->getPid(), 0)) {
-                $this->logger->warning(sprintf('Marking execution with id %d as stale. (%s)', $execution->getPid(), $execution->getJob()));
-                $execution
-                    ->setState(Execution::STATE_STALE)
-                    ->setPid(null);
-                $this->em->flush($execution);
+                                                    $this->em->refresh($execution);
+                                                                    if ($execution->getState() === Execution::STATE_RUNNING) {
+                                                                        $this->logger->warning(sprintf('Marking execution with id %d as stale. (%s)', $execution->getPid(), $execution->getJob()));
+                                                                        $execution
+                                                                            ->setState(Execution::STATE_STALE)
+                                                                            ->setPid(null);
+                                                                        $this->em->flush($execution);
+                                                                    }
             }
         }
     }