Always perform a full scan when scheduling a job initially

Icinga · Jul 31, 2023 · 8d4c04a · 8d4c04a
1 parent d02bd31
commit 8d4c04a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/library/X509/Job.php b/library/X509/Job.php
@@ -242,7 +242,7 @@ public function isFinished(): bool
 
     public function updateLastScan($target)
     {
-        if (! $this->isRescan()) {
+        if (! $this->isRescan() || ! isset($target->id)) {
             return;
         }
 
@@ -266,7 +266,19 @@ public function getChecksum(): string
 
     protected function getScanTargets(): Generator
     {
-        if (! $this->isRescan() || $this->fullScan) {
+        $generate = $this->fullScan || ! $this->isRescan();
+        if (! $generate) {
+            $run = X509JobRun::on($this->db)
+                ->columns([new Expression('1')])
+                ->filter(Filter::equal('schedule.job_id', $this->getId()))
+                ->filter(Filter::unequal('total_targets', 0))
+                ->limit(1)
+                ->execute();
+
+            $generate = ! $run->hasResult();
+        }
+
+        if ($generate) {
             yield from $this->generateTargets();
         }