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

Cleanup after merge

Browse Source
This commit is contained in:
Romain Neutron
2012-03-20 21:29:52 +01:00
parent 415be93920
commit 7a82a72e30
3 changed files with 8 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,7 @@ class task_Scheduler
protected static function get_connection()
{
require dirname(__FILE__) . '/../../../config/connexion.inc';
return(appbox::get_instance()->get_connection());
return appbox::get_instance(\bootstrap::getCore())->get_connection();
}
public function run($input=null, OutputInterface $output = null) //, $log = true, $log_tasks = true)
@@ -66,7 +65,7 @@ class task_Scheduler
require_once dirname(__FILE__) . '/../../bootstrap.php';
$this->input = $input;
$this->output = $output;
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $appbox->get_registry();
$nullfile = '';
@@ -122,7 +121,7 @@ class task_Scheduler
$logdir = $registry->get('GV_RootPath') . 'logs/';
$conn = appbox::get_instance()->get_connection();
$conn = appbox::get_instance(\bootstrap::getCore())->get_connection();
$taskPoll = array(); // the poll of tasks
@@ -184,7 +183,7 @@ class task_Scheduler
sleep(1);
try
{
$conn = appbox::get_instance()->get_connection();
$conn = appbox::get_instance(\bootstrap::getCore())->get_connection();
}
catch(ErrorException $e)
{

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

@@ -153,22 +153,9 @@ class task_manager
}
public function get_scheduler_state()
{
$sql = "SELECT schedstatus,
UNIX_TIMESTAMP()-UNIX_TIMESTAMP(schedqtime) AS schedqdelay, schedpid
FROM sitepreff";
$stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute();
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor();
return $row;
}
public function get_scheduler_state2()
{
$pid = NULL;
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$lockdir = $appbox->get_registry()->get('GV_RootPath') . 'tmp/locks/';
if( ($schedlock = fopen( $lockdir . 'scheduler.lock', 'a+')) )
{