BUGFIX: don't make the result appear multiple times

This commit is contained in:
Jeroen De Meerleer 2021-05-28 19:16:25 +02:00
parent 5ec78ff3f3
commit ebc442f5ce
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
1 changed files with 6 additions and 6 deletions

View File

@ -196,6 +196,9 @@ class Job extends Repository
if($job['running'] > time()) {
exit;
}
$jobsSql = "UPDATE job SET running = :status WHERE id = :id";
$jobsStmt = $this->dbcon->prepare($jobsSql);
$jobsStmt->executeQuery([':id' => $job['id'], ':status' => 1]);
if (!empty($job['data']['vars'])) {
foreach ($job['data']['vars'] as $key => $var) {
@ -208,12 +211,9 @@ class Job extends Repository
$return = $this->runLocalCommand($job['data']['getservices-command']);
}
$jobsSql = "UPDATE job SET running = :status WHERE id = :id";
$jobsStmt = $this->dbcon->prepare($jobsSql);
$jobsStmt->executeQuery([':id' => $job['id'], ':status' => 1]);
$starttime = (float)$this->getTempVar($job['id'], 'starttime');
$return['starttime'] = $starttime;
$this->deleteTempVar($job['id'], 'starttime');
$return['starttime'] = $starttime;
return $return;
}
@ -239,7 +239,7 @@ class Job extends Repository
$result = $this->runRebootJob($job, $starttime);
}
$endtime = microtime(true);
$runtime = $endtime - ($return['starttime'] ?? $starttime);
$runtime = $endtime - ($result['starttime'] ?? $starttime);
// handling of response
$addRunSql = 'INSERT INTO run(job_id, exitcode, output, runtime, timestamp) VALUES (:job_id, :exitcode, :output, :runtime, :timestamp)';