hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-11-07 16:16:13 +01:00
parent d25bae42a7 599f29ec0f
commit 527b68e0f5
28 changed files with 540 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/task/Scheduler.class.php
View File

@@ -35,6 +35,7 @@ class task_Scheduler
public function __construct(Application $application, Logger $logger)
{
declare(ticks = 1);
$this->dependencyContainer = $application;
$this->logger = $logger;
}
@@ -50,6 +51,14 @@ class task_Scheduler
* @throws Exception if scheduler is already running
* @todo doc all possible exception
*/
public function sigHandler($signal)
{
$status = null;
$pid = pcntl_wait($status);
$exitstatus = pcntl_wexitstatus($status);
$this->log(sprintf("sigchild %s received from pid=%s, status=%s, exitstatus=%s\n", $signal, $pid, var_export($status, true), $exitstatus));
}
public function run()
{
//prevent scheduler to fail if GV_cli is not provided
@@ -67,7 +76,10 @@ class task_Scheduler
if (\task_manager::isPosixPcntlSupported()) {
// avoid <defunct> php when a task ends
pcntl_signal(SIGCHLD, SIG_IGN);
// pcntl_signal(SIGCHLD, SIG_IGN); // no zombies but no returnValue
// pcntl_signal(SIGCHLD, SIG_DFL); // with "declare(ticks=1)" returnValue ok but zombies
pcntl_signal(SIGCHLD, array($this, 'sigHandler')); // ok
$this->method = self::METHOD_FORK;
}