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

Remove platform detection

Browse Source
This commit is contained in:
Romain Neutron
2012-05-24 14:52:20 +02:00
parent a3c87fdf10
commit 2b7c196d13
13 changed files with 106 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/module/console/schedulerStart.class.php
View File

@@ -52,8 +52,8 @@ class module_console_schedulerStart extends Command
$logger->pushHandler($handler);
try {
$scheduler = new task_Scheduler();
$scheduler->run($logger);
$scheduler = new task_Scheduler($logger);
$scheduler->run();
} catch (\Exception $e) {
switch ($e->getCode()) {
case task_Scheduler::ERR_ALREADY_RUNNING: // 114 : aka EALREADY (Operation already in progress)

5
lib/classes/module/console/taskrun.class.php
View File

@@ -81,7 +81,6 @@ class module_console_taskrun extends Command
$appbox = \appbox::get_instance(\bootstrap::getCore());
$task_manager = new task_manager($appbox);
$this->task = $task_manager->getTask($task_id);
if ($input->getOption('runner') === task_abstract::RUNNER_MANUAL) {
$schedStatus = $task_manager->getSchedulerState();
@@ -109,6 +108,8 @@ class module_console_taskrun extends Command
$handler = new Handler\RotatingFileHandler($logfile, 10, $level = Logger::WARNING);
$logger->pushHandler($handler);
$this->task = $task_manager->getTask($task_id, $logger);
register_tick_function(array($this, 'tick_handler'), true);
declare(ticks = 1);
@@ -117,7 +118,7 @@ class module_console_taskrun extends Command
}
try {
$this->task->run($runner, $logger);
$this->task->run($runner);
} catch (Exception $e) {
$this->task->log(sprintf("taskrun : exception from 'run()', %s \n", $e->getMessage()));