Merge branch 'task/new-reboot-after-trigger'
This commit is contained in:
commit
5dcd8c8da5
13
webcron.php
13
webcron.php
|
@ -128,11 +128,9 @@ unlink('/tmp/webcron.lock');
|
|||
|
||||
if(file_exists("cache/reboot.trigger")) {
|
||||
unlink("cache/reboot.trigger");
|
||||
$rebootser = serialize($rebootjobs);
|
||||
file_put_contents("cache/get-services.trigger", $rebootser);
|
||||
file_put_contents("cache/reboot-time.trigger", time() + (get_configvalue('jobs.reboottime') + get_configvalue('jobs.rebootwait')));
|
||||
$rebooted_hosts = array();
|
||||
$count=0;
|
||||
foreach($rebootjobs as $job) {
|
||||
if (!(isset($job['done']) && $job['done'] == true)) {
|
||||
$rebooter = preg_replace("/reboot /", "", $job['url'], 1);
|
||||
$rebooter = urlencode($rebooter);
|
||||
$rebooter = str_replace("cmd%3D", "cmd=", $rebooter);
|
||||
|
@ -150,6 +148,13 @@ if(file_exists("cache/reboot.trigger")) {
|
|||
$url = "ssh " . $job['host'] . " '" . $cmd . " &'";
|
||||
exec($url);
|
||||
$cmd = '';
|
||||
$rebootjobs[$count]['done'] = true;
|
||||
}
|
||||
$count++;
|
||||
}
|
||||
|
||||
$rebootser = serialize($rebootjobs);
|
||||
file_put_contents("cache/get-services.trigger", $rebootser);
|
||||
file_put_contents("cache/reboot-time.trigger", time() + (get_configvalue('jobs.reboottime') + get_configvalue('jobs.rebootwait')));
|
||||
}
|
||||
require_once 'include/finalize.inc.php';
|
||||
|
|
Loading…
Reference in New Issue