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

Update tasks

Browse Source
This commit is contained in:
Romain Neutron
2012-09-21 15:02:24 +02:00
parent baf3f6692a
commit bafb4edca9
15 changed files with 140 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Core\Configuration;
use Alchemy\Phrasea\Application;
use Monolog\Logger;
@@ -46,20 +47,13 @@ class task_Scheduler
return $this;
}
protected static function get_connection()
{
return appbox::get_instance(\bootstrap::getCore())->get_connection();
}
/**
* @throws Exception if scheduler is already running
* @todo doc all possible exception
*/
public function run()
{
$appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $appbox->get_registry();
$registry = $this->dependencyContainer['phraseanet.registry'];
//prevent scheduler to fail if GV_cli is not provided
if ( ! is_executable($registry->get('GV_cli'))) {
@@ -115,7 +109,7 @@ class task_Scheduler
$this->log(sprintf("running scheduler with method %s", $this->method));
$conn = appbox::get_instance(\bootstrap::getCore())->get_connection();
$conn = $this->dependencyContainer['phraseanet.appbox']->get_connection();
$taskPoll = array(); // the poll of tasks
@@ -124,10 +118,10 @@ class task_Scheduler
$sql = "UPDATE sitepreff SET schedstatus='started'";
$conn->exec($sql);
$task_manager = new task_manager($appbox);
$task_manager = new task_manager($this->dependencyContainer);
// set every 'auto-start' task to start
foreach ($task_manager->getTasks($this->dependencyContainer) as $task) {
foreach ($task_manager->getTasks() as $task) {
if ($task->isActive()) {
if ( ! $task->getPID()) {
/* @var $task task_abstract */
@@ -161,7 +155,7 @@ class task_Scheduler
sleep(1);
}
try {
$conn = appbox::get_instance(\bootstrap::getCore())->get_connection();
$conn = $this->dependencyContainer['phraseanet.appbox']->get_connection();
} catch (ErrorException $e) {
$ping = false;
}
@@ -214,7 +208,7 @@ class task_Scheduler
$taskPoll[$tkey]["todel"] = true;
}
foreach ($task_manager->getTasks($this->dependencyContainer, true) as $task) {
foreach ($task_manager->getTasks(true) as $task) {
$tkey = "t_" . $task->getID();
$status = $task->getState();