maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Improved cron_traffic, fixes #977

Browse Source 
Thanks to d4f

Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
This commit is contained in:
Andreas Burchert (scarya)
2011-12-06 15:58:44 +01:00
parent 3c1d63cbcb
commit e162a1c893
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scripts/jobs/cron_traffic.php
View File

@@ -17,6 +17,45 @@
*
*/
//Check Traffic-Lock
$TrafficLock = dirname($lockfile)."/froxlor_cron_traffic.lock";
if(file_exists($TrafficLock) && is_numeric($TrafficPid=file_get_contents($TrafficLock))) {
if(function_exists('posix_kill')) {
$TrafficPidStatus = @posix_kill($TrafficPid,0);
}
else {
system("kill -CHLD " . $TrafficPid . " 1> /dev/null 2> /dev/null", $TrafficPidStatus);
$TrafficPidStatus = $TrafficPidStatus ? false : true;
}
if($TrafficPidStatus) {
fwrite($debugHandler,"Traffic Run already in progress\n");
return 1;
}
}
//Create Traffic Log and Fork
$TrafficPid = pcntl_fork();
if($TrafficPid) { //Parent
file_put_contents($TrafficLock,$TrafficPid);
return 0;
}
elseif($TrafficPid == 0) { //Child
posix_setsid();
fclose($debugHandler);
$debugHandler = fopen("/tmp/froxlor_traffic.log","w");
require ($pathtophpfiles . '/lib/userdata.inc.php'); //There is no bloody reason not to have sql values in the backend ready!
if(isset($sql['root_user']) && isset($sql['root_password']) && (!isset($sql_root) || !is_array($sql_root))) {
$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password']));
unset($sql['root_user']);
unset($sql['root_password']);
}
$db->close();
unset($db);
$db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']); //detabase handler renewal after fork()
}
else { //Fork failed
return 1;
}
openRootDB($debugHandler, $lockfile);
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_traffic.inc.functions.php'));
@@ -481,4 +520,6 @@ $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP()
closeRootDB();
die();
?>