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

reverts

Browse Source
This commit is contained in:
jygaulier
2012-09-26 17:52:07 +02:00
parent 7e2d522c77
commit 9476fb6b51
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,10 +54,6 @@ class task_Scheduler
*/ */
public function run() public function run()
{ {
if (function_exists('pcntl_signal')) {
// avoid <defunct> php when a task ends
pcntl_signal(SIGCHLD, SIG_IGN);
}
$appbox = appbox::get_instance(\bootstrap::getCore()); $appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();
@@ -76,6 +72,9 @@ class task_Scheduler
} }
if (function_exists('pcntl_fork')) { if (function_exists('pcntl_fork')) {
// avoid <defunct> php when a task ends
pcntl_signal(SIGCHLD, SIG_IGN);
$this->method = self::METHOD_FORK; $this->method = self::METHOD_FORK;
} }

2
lib/classes/task/abstract.class.php
View File

@@ -321,7 +321,7 @@ abstract class task_abstract
abstract public function help(); abstract public function help();
public function __construct($taskid, Logger $logger = NULL) public function __construct($taskid, Logger $logger)
{ {
$this->logger = $logger; $this->logger = $logger;

12
lib/classes/task/manager.class.php
View File

@@ -41,9 +41,9 @@ class task_manager
$core = \bootstrap::getCore(); $core = \bootstrap::getCore();
// if ( ! $logger) { if ( ! $logger) {
// $logger = $core['monolog']; $logger = $core['monolog'];
// } }
$sql = "SELECT task2.* FROM task2 ORDER BY task_id ASC"; $sql = "SELECT task2.* FROM task2 ORDER BY task_id ASC";
$stmt = $this->appbox->get_connection()->prepare($sql); $stmt = $this->appbox->get_connection()->prepare($sql);
@@ -81,9 +81,9 @@ class task_manager
{ {
$core = \bootstrap::getCore(); $core = \bootstrap::getCore();
// if ( ! $logger) { if ( ! $logger) {
// $logger = $core['monolog']; $logger = $core['monolog'];
// } }
$tasks = $this->getTasks(false, $logger); $tasks = $this->getTasks(false, $logger);