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

syslog + maillog in task / task-manager as service

Browse Source 
fix task interfaces / cleanup
fix tests using task manager
This commit is contained in:
jygaulier
2012-12-18 12:10:24 +01:00
parent 7f36edb830
commit 2d6e087104
33 changed files with 1020 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/API/V1/adapter.php
View File

@@ -101,7 +101,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new \API_V1_result($app['request'], $this);
$taskManager = new \task_manager($app);
$taskManager = $app['task-manager'];
$ret = $taskManager->getSchedulerState();
$ret['state'] = $ret['status'];
@@ -127,7 +127,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new \API_V1_result($app['request'], $this);
$taskManager = new \task_manager($app);
$taskManager = $app['task-manager'];
$tasks = $taskManager->getTasks();
$ret = array();
@@ -166,7 +166,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new \API_V1_result($app['request'], $this);
$taskManager = new task_manager($app);
$taskManager = $app['task-manager'];
$ret = array(
'task' => $this->list_task($taskManager->getTask($taskId))
@@ -188,7 +188,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new \API_V1_result($app['request'], $this);
$taskManager = new \task_manager($app);
$taskManager = $app['task-manager'];
$task = $taskManager->getTask($taskId);
if (!in_array($task->getState(), array(\task_abstract::STATE_TOSTART, \task_abstract::STATE_STARTED))) {
@@ -211,7 +211,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new API_V1_result($app['request'], $this);
$taskManager = new \task_manager($app);
$taskManager = $app['task-manager'];
$task = $taskManager->getTask($taskId);
if (!in_array($task->getState(), array(\task_abstract::STATE_TOSTOP, \task_abstract::STATE_STOPPED))) {
@@ -243,7 +243,7 @@ class API_V1_adapter extends API_V1_Abstract
throw new \API_V1_exception_badrequest();
}
$taskManager = new \task_manager($app);
$taskManager = $app['task-manager'];
$task = $taskManager->getTask($taskId);