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

BUGFIX: SSH-jobs are failing terribly

This commit is contained in:
Jeroen De Meerleer 2021-09-22 10:26:52 +02:00
parent 3438201b18
commit 3687fd2a15
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Repository/Job.php
View File

@ -163,12 +163,19 @@ class Job extends Repository
if ($job['data']['containertype'] == 'docker') {
$command = $this->prepareDockerCommand($command, $job['data']['service'], $job['data']['container-user']);
}
if($job['data']['hosttype'] == 'local') {
$return = $this->runLocalCommand($command);
} elseif($job['data']['hosttype'] == 'ssh') {
$return = $this->runSshCommand($command, $job['data']['host'], $job['data']['user'], $job['data']['ssh-privkey'], $job['data']['privkey-password']);
try {
if($job['data']['hosttype'] == 'local') {
$return = $this->runLocalCommand($command);
} elseif($job['data']['hosttype'] == 'ssh') {
$return = $this->runSshCommand($command, $job['data']['host'], $job['data']['user'], $job['data']['ssh-privkey'], $job['data']['privkey-password']);
}
$return['failed'] = !in_array($return['exitcode'], $job['data']['response']);
} catch (\RuntimeException $exception) {
$return['exitcode'] = $exception->getCode();
$return['output'] = $exception->getMessage();
$return['failed'] = true;
}
$return['failed'] = !in_array($return['exitcode'], $job['data']['response']);
return $return;
}
@ -196,7 +203,6 @@ class Job extends Repository
} elseif (!empty($password)) {
$key = $password;
}
if (!$ssh->login($user, $key)) {
$return['output'] = "Login failed";
$return['exitcode'] = 255;