From 567c6c95fd742feb9a5db9f383bfb7439de6423b Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 28 Dec 2011 23:14:50 +0100 Subject: [PATCH 1/2] Bump to version 3.5.5 --- lib/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.inc b/lib/version.inc index e5fae0fe26..104f48509f 100644 --- a/lib/version.inc +++ b/lib/version.inc @@ -15,5 +15,5 @@ * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -define('GV_version', '3.5.4.0'); +define('GV_version', '3.5.5.0'); define('GV_version_name', 'Baobab'); From 32ddd4aee8cb6bdd79d47db9bf56be3326a3ccfd Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 29 Dec 2011 14:03:52 +0100 Subject: [PATCH 2/2] Task do not have a correct return value when abox connection is lost --- lib/classes/task/appboxAbstract.class.php | 5 +++-- lib/classes/task/databoxAbstract.class.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/classes/task/appboxAbstract.class.php b/lib/classes/task/appboxAbstract.class.php index d33fc86554..80344bea4c 100644 --- a/lib/classes/task/appboxAbstract.class.php +++ b/lib/classes/task/appboxAbstract.class.php @@ -38,8 +38,9 @@ abstract class task_appboxAbstract extends task_abstract $this->log(("Warning : abox connection lost, restarting in 10 min.")); sleep(60 * 10); $this->running = false; + $this->return_value = self::RETURNSTATUS_TORESTART; - return(''); + return; } $this->set_last_exec_time(); @@ -85,7 +86,7 @@ abstract class task_appboxAbstract extends task_abstract $this->pause($duration); } - return($this->return_value); + return; } /** diff --git a/lib/classes/task/databoxAbstract.class.php b/lib/classes/task/databoxAbstract.class.php index f0559140d0..6049b7a48b 100644 --- a/lib/classes/task/databoxAbstract.class.php +++ b/lib/classes/task/databoxAbstract.class.php @@ -46,8 +46,9 @@ abstract class task_databoxAbstract extends task_abstract $this->log(("Warning : abox connection lost, restarting in 10 min.")); sleep(60 * 10); $this->running = false; + $this->return_value = self::RETURNSTATUS_TORESTART; - return(''); + return; } $this->set_last_exec_time(); @@ -104,7 +105,7 @@ abstract class task_databoxAbstract extends task_abstract $this->pause($duration); } - return($this->return_value); + return; } /**