From 1a774f230002a5b769e4adda7e61ee3f1dc372bd Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 21 May 2022 10:50:37 +0200 Subject: [PATCH] BUGFIX: reboot jobs were running everytime over and over again --- src/Repository/JobRepository.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Repository/JobRepository.php b/src/Repository/JobRepository.php index f155c0e..18dc193 100644 --- a/src/Repository/JobRepository.php +++ b/src/Repository/JobRepository.php @@ -140,7 +140,7 @@ class JobRepository extends EntityRepository { $em = $this->getEntityManager(); - $job->setRunning($status ? 1 : 0); + if(in_array($job->getRunning(), [0,1,2])) $job->setRunning($status ? 1 : 0); $em->persist($job); $em->flush(); @@ -165,7 +165,7 @@ class JobRepository extends EntityRepository */ public function deleteTempVar(Job &$job, ?string $name = NULL ): void { - $job->removeData('temp_vars' . ($name !== NULL ? '.' . $name : '')); + $job->removeData('temp_vars.' . ($name !== NULL ? '.' . $name : '')); } /** @@ -176,7 +176,7 @@ class JobRepository extends EntityRepository */ public function getTempVar(Job $job, string $name, mixed $default = NULL): mixed { - return $job->getData('temp_vars' . $name) ?? $default; + return $job->getData('temp_vars.' . $name) ?? $default; } /** @@ -342,7 +342,9 @@ class JobRepository extends EntityRepository $manual = $this->getTempVar($job, 'manual'); $this->deleteTempVar($job, 'manual'); - $this->setJobRunning($job, true); + $job->setRunning(1); + $em->persist($job); + $em->flush(); $getservicescommand = $job->getData('getservices-command'); if (!empty($job->getData('vars'))) {