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

And the next try to fix the mysql - bug in cron, refs #1025

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2012-03-08 19:29:17 +01:00
parent 401f5dad8b
commit 3d9bd124b1
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/jobs/cron_traffic.php
View File

@@ -33,10 +33,21 @@ if(function_exists('pcntl_fork')) {
return 1; return 1;
} }
} }
//Create Traffic Log and Fork //Create Traffic Log and Fork
// We close the database - connection before we fork, so we don't share resources with the child
$db->close();
unset($db);
$TrafficPid = pcntl_fork(); $TrafficPid = pcntl_fork();
if($TrafficPid) { //Parent if($TrafficPid) { //Parent
file_put_contents($TrafficLock,$TrafficPid); file_put_contents($TrafficLock,$TrafficPid);
// Recreate the database - connection
require ($pathtophpfiles . '/lib/userdata.inc.php');
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 = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']);
return 0; return 0;
} }
elseif($TrafficPid == 0) { //Child elseif($TrafficPid == 0) { //Child
@@ -49,16 +60,14 @@ if(function_exists('pcntl_fork')) {
unset($sql['root_user']); unset($sql['root_user']);
unset($sql['root_password']); unset($sql['root_password']);
} }
$db->close(); $db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']); //database handler renewal after fork()
unset($db);
$db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']); //detabase handler renewal after fork()
} }
else { //Fork failed else { //Fork failed
return 1; return 1;
} }
} }
else { else {
fwrite($debugHandler,"PHP compiled without pcntl. Not forking traffic-cron, this may take a long time!"); fwrite($debugHandler,"PHP compiled without pcntl. Not forking traffic-cron, this may take a long time!");
} }
openRootDB($debugHandler, $lockfile); openRootDB($debugHandler, $lockfile);