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

fix bug causing programs executed inside a forked task (ex. running imagemagick) to always return status -1

Browse Source
This commit is contained in:
jygaulier
2012-07-05 17:10:35 +02:00
parent 634d3ae319
commit 94f4ddcd4b
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,10 +108,6 @@ class task_Scheduler
$this->log(sprintf("running scheduler with method %s", $this->method)); $this->log(sprintf("running scheduler with method %s", $this->method));
if ($this->method == self::METHOD_FORK) {
pcntl_signal(SIGCHLD, SIG_IGN);
}
$conn = appbox::get_instance(\bootstrap::getCore())->get_connection(); $conn = appbox::get_instance(\bootstrap::getCore())->get_connection();
$taskPoll = array(); // the poll of tasks $taskPoll = array(); // the poll of tasks
@@ -230,7 +226,8 @@ class task_Scheduler
$task->getID(), '--runner=scheduler' $task->getID(), '--runner=scheduler'
), ),
"killat" => null, "killat" => null,
"sigterm_sent" => false "sigterm_sent" => false,
"pid" => false
); );
if ($this->method == self::METHOD_PROC_OPEN) { if ($this->method == self::METHOD_PROC_OPEN) {
$taskPoll[$tkey]['process'] = NULL; $taskPoll[$tkey]['process'] = NULL;
@@ -293,7 +290,17 @@ class task_Scheduler
@proc_close($taskPoll[$tkey]["process"]); @proc_close($taskPoll[$tkey]["process"]);
$taskPoll[$tkey]["process"] = null; $taskPoll[$tkey]["process"] = null;
} elseif ($this->method == self::METHOD_FORK) {
$pid = $taskPoll[$tkey]['pid'];
if ($pid) {
$status = NULL;
if (pcntl_waitpid($pid, $status, WNOHANG) === $pid) {
// pid has quit
$taskPoll[$tkey]['pid'] = false;
}
}
} }
if ($schedstatus == 'started') { if ($schedstatus == 'started') {
$taskPoll[$tkey]["task"]->setState(task_abstract::STATE_TOSTART); $taskPoll[$tkey]["task"]->setState(task_abstract::STATE_TOSTART);
} }
@@ -332,13 +339,14 @@ class task_Scheduler
sleep(2); // let the process lock and write it's pid sleep(2); // let the process lock and write it's pid
} }
if (is_resource($taskPoll[$tkey]["process"]) && $taskPoll[$tkey]['task']->getPID() !== null) { if (is_resource($taskPoll[$tkey]["process"]) && ($pid = $taskPoll[$tkey]['task']->getPID()) !== null) {
$taskPoll[$tkey]['pid'] = $pid;
$this->log( $this->log(
sprintf( sprintf(
"Task %s '%s' started (pid=%s)" "Task %s '%s' started (pid=%s)"
, $taskPoll[$tkey]['task']->getID() , $taskPoll[$tkey]['task']->getID()
, $taskPoll[$tkey]["cmd"] . ' ' . implode(' ', $taskPoll[$tkey]["args"]) , $taskPoll[$tkey]["cmd"] . ' ' . implode(' ', $taskPoll[$tkey]["args"])
, $taskPoll[$tkey]['task']->getPID() , $pid
) )
); );
$runningtask ++; $runningtask ++;
@@ -380,6 +388,9 @@ class task_Scheduler
$this->log(sprintf("exec('%s %s')", $taskPoll[$tkey]["cmd"], implode(' ', $taskPoll[$tkey]["args"]))); $this->log(sprintf("exec('%s %s')", $taskPoll[$tkey]["cmd"], implode(' ', $taskPoll[$tkey]["args"])));
pcntl_exec($taskPoll[$tkey]["cmd"], $taskPoll[$tkey]["args"]); pcntl_exec($taskPoll[$tkey]["cmd"], $taskPoll[$tkey]["args"]);
} else {
// parent (scheduler)
$taskPoll[$tkey]['pid'] = $pid;
} }
} }
break; break;
@@ -517,6 +528,15 @@ class task_Scheduler
$taskPoll[$tkey]["process"] = null; $taskPoll[$tkey]["process"] = null;
} }
} elseif ($this->method == self::METHOD_FORK) {
$pid = $taskPoll[$tkey]['pid'];
if ($pid) {
$status = NULL;
if (pcntl_waitpid($pid, $status, WNOHANG) === $pid) {
// pid has quit
$taskPoll[$tkey]['pid'] = false;
}
}
} }
break; break;
} }