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

Added running of jobs inside containers and local

This commit is contained in:
Jeroen De Meerleer 2021-05-27 20:24:03 +02:00
parent 9fe4c0a6d0
commit 0282edbdfd
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Command/DaemonCommand.php
View File

@ -49,10 +49,10 @@ class DaemonCommand extends Command
if(!empty($jobsToRun)) {
foreach($jobsToRun as $job) {
$jobRepo->setJobRunning($job, true);
$output->writeln('Runnig Job ' . $job);
declare(ticks = 1);
pcntl_signal(SIGCHLD, SIG_IGN);
$pid = pcntl_fork();
$output->writeln('Running Job ' . $job);
declare(ticks = 1);
pcntl_signal(SIGCHLD, SIG_IGN);
$pid = pcntl_fork();
if($pid == -1) {
$jobRepo->RunJob($job);
$jobRepo->setJobRunning($job, false);

32
src/Repository/Job.php
View File

@ -52,9 +52,12 @@ class Job extends Repository
if($job['data']['crontype'] == 'http') {
$client = new Client();
foreach($job['data']['vars'] as $key => $var) {
$job['data']['basicauth-username'] = str_replace('{' . $key . '}', $var['value'], $job['data']['basicauth-username']);
$job['data']['url'] = str_replace('{' . $key . '}', $var['value'], $job['data']['url']);
if(!empty($job['data']['vars'])) {
foreach($job['data']['vars'] as $key => $var) {
$job['data']['basicauth-username'] = str_replace('{' . $key . '}', $var['value'], $job['data']['basicauth-username']);
$job['data']['url'] = str_replace('{' . $key . '}', $var['value'], $job['data']['url']);
}
}
$url = $job['data']['url'];
@ -65,7 +68,26 @@ class Job extends Repository
$exitcode = $res->getStatusCode();
$output = $res->getBody();
} elseif($job['data']['crontype'] == 'command') {
if($job['data']['hosttype'] == 'ssh') {
if(!empty($job['data']['vars'])) {
foreach ($job['data']['vars'] as $key => $var) {
$job['data']['command'] = str_replace('{' . $key . '}', $var['value'], $job['data']['command']);
}
}
$command = $job['data']['command'];
$prepend = '';
if ($job['data']['containertype'] == 'docker') {
$prepend = 'docker exec ';
$prepend .= $job['data']['service'] . ' ';
$prepend .= (!empty($job['data']['container-user'])) ? ' --user=' . $job['data']['container-user'] . ' ' : '';
}
if($job['data']['hosttype'] == 'local') {
pcntl_signal(SIGCHLD, SIG_DFL);
$output=null;
$exitcode=null;
exec($prepend . $command . ' 2>&1', $output, $exitcode);
pcntl_signal(SIGCHLD, SIG_IGN);
} elseif($job['data']['hosttype'] == 'ssh') {
$ssh = new SSH2($job['data']['host']);
$key = null;
if(!empty($job['data']['ssh-privkey'])) {
@ -81,7 +103,7 @@ class Job extends Repository
if (!$ssh->login($job['data']['user'], $key)) {
throw new \Exception('Login failed');
}
$output = $ssh->exec($job['data']['command']);
$output = $ssh->exec($prepend . $command);
$exitcode = $ssh->getExitStatus();
}
}