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

Merge branch 'bug/config-reboot-cmd'

This commit is contained in:
Jeroen De Meerleer 2019-04-26 17:35:18 +02:00
parent b1fca376d3 0bc9eba88f
commit 3dfbb9df0f
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webcron.php
View File

@ -130,7 +130,7 @@ 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')) * 60));
file_put_contents("cache/reboot-time.trigger", time() + (get_configvalue('jobs.reboottime') + get_configvalue('jobs.rebootwait')));
$rebooted_hosts = array();
foreach($rebootjobs as $job) {
$rebooter = preg_replace("/reboot /", "", $job['url'], 1);
@ -142,7 +142,8 @@ if(file_exists("cache/reboot.trigger")) {
$cmd = $rebootcommands['cmd'];
if ($cmd == '') {
$cmd = 'sudo shutdown -r -t{}+ "A reboot has been scheduled. Please save your work."';
$cmd = 'sudo shutdown -r +{}+ "A reboot has been scheduled. Please save your work."';
$cmd = str_replace("{}+", intdiv(get_configvalue('jobs.rebootwait'), 60), $cmd);
}
$cmd = str_replace("{}+", get_configvalue('jobs.rebootwait'), $cmd);