From a49157b7d6de3bade42fde69eb06cb1cc570a861 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Mon, 19 Mar 2012 19:36:07 +0100 Subject: [PATCH] Fix build --- lib/Alchemy/Phrasea/Cache/Manager.php | 2 +- lib/classes/task/manager.class.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/Alchemy/Phrasea/Cache/Manager.php b/lib/Alchemy/Phrasea/Cache/Manager.php index aa0ab90c1e..d2358699b9 100644 --- a/lib/Alchemy/Phrasea/Cache/Manager.php +++ b/lib/Alchemy/Phrasea/Cache/Manager.php @@ -87,7 +87,7 @@ class Manager if ($this->hasChange($cacheKey, $service_name)) { - $service->getDriver()->flush(); + $service->getDriver()->flushAll(); if ($write) { $this->registry[$cacheKey] = $service_name; diff --git a/lib/classes/task/manager.class.php b/lib/classes/task/manager.class.php index c144b14a21..4ec71b093e 100644 --- a/lib/classes/task/manager.class.php +++ b/lib/classes/task/manager.class.php @@ -78,13 +78,13 @@ class task_manager $tasks = array(); - $appbox = appbox::get_instance(); + $appbox = \appbox::get_instance(\bootstrap::getCore()); $lockdir = $appbox->get_registry()->get('GV_RootPath') . 'tmp/locks/'; foreach ($rs as $row) { $row['pid'] = NULL; - + $classname = $row['class']; if (!class_exists($classname)) continue; @@ -164,7 +164,7 @@ class task_manager return $row; } - + public function get_scheduler_state2() { $pid = NULL; @@ -184,13 +184,13 @@ class task_manager } fclose($schedlock); } - + $sql = "SELECT UNIX_TIMESTAMP()-UNIX_TIMESTAMP(schedqtime) AS qdelay, schedstatus AS status FROM sitepreff"; $stmt = $this->appbox->get_connection()->prepare($sql); $stmt->execute(); $ret = $stmt->fetch(PDO::FETCH_ASSOC); $stmt->closeCursor(); - + if($pid === NULL && $ret['status'] !== 'stopped') { // auto fix @@ -200,7 +200,7 @@ class task_manager $ret['pid'] = $pid; return($ret); } - + public static function getAvailableTasks() { $registry = registry::get_instance();