webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

Very long running jobs were losing the database connection

This commit is contained in:
Jeroen De Meerleer 2022-04-22 09:33:41 +02:00
parent 115b4b74a3
commit 6923152a62
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Framework/Kernel.php
View File

@ -125,10 +125,6 @@ class Kernel
} }
public function getNewDbCon(): Connection { public function getNewDbCon(): Connection {
if(!is_null($this->dbCon)) {
$this->dbCon->close();
$this->dbCon = null;
}
$this->dbCon = DriverManager::getConnection(['url' => $_ENV['DATABASE']]); $this->dbCon = DriverManager::getConnection(['url' => $_ENV['DATABASE']]);
return $this->dbCon; return $this->dbCon;
} }

11
src/Command/DaemonCommand.php
View File

@ -68,14 +68,13 @@ class DaemonCommand extends Command
declare(ticks = 1); declare(ticks = 1);
pcntl_signal(SIGCHLD, SIG_IGN); pcntl_signal(SIGCHLD, SIG_IGN);
$pid = pcntl_fork(); $pid = pcntl_fork();
$jobRepo = NULL; $jobRepoFork = new Job($this->kernel->getNewDbCon());
$jobRepo = new Job($this->kernel->getNewDbCon());
if($pid == -1) { if($pid == -1) {
$jobRepo->RunJob($job['id'], $job['running'] == 2); $jobRepoFork->RunJob($job['id'], $job['running'] == 2);
$jobRepo->setJobRunning($job['id'], false); $jobRepoFork->setJobRunning($job['id'], false);
} elseif ($pid == 0) { } elseif ($pid == 0) {
$jobRepo->RunJob($job['id'], $job['running'] == 2); $jobRepoFork->RunJob($job['id'], $job['running'] == 2);
$jobRepo->setJobRunning($job['id'], false); $jobRepoFork->setJobRunning($job['id'], false);
exit; exit;
} }
} }

4
src/Repository/Job.php
View File

@ -416,6 +416,7 @@ class Job extends Repository
public function runJob(int $job, bool $manual): array public function runJob(int $job, bool $manual): array
{ {
global $kernel;
$starttime = microtime(true); $starttime = microtime(true);
$job = $this->getJob($job, true); $job = $this->getJob($job, true);
if ($job['data']['crontype'] == 'http') { if ($job['data']['crontype'] == 'http') {
@ -450,7 +451,8 @@ class Job extends Repository
} }
} }
// saving to database // saving to database
$runRepo = new Run($this->dbcon); $runRepo = new Run($kernel->getNewDbCon());
$this->dbcon = $kernel->getNewDbCon();
$runRepo->addRun($job['id'], $result['exitcode'], floor($starttime), $runtime, $result['output'], $flags); $runRepo->addRun($job['id'], $result['exitcode'], floor($starttime), $runtime, $result['output'], $flags);
if (!$manual){ if (!$manual){
// setting nextrun to next run // setting nextrun to next run