From 7abc751ceb55c1f7492db141bb384260585c6ff1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 6 Jun 2014 17:50:17 +0200
Subject: Variable timeout for Taskmanager::waitComplete

---
 inc/taskmanager.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/taskmanager.inc.php')

diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php
index dfacc5a7..308d7136 100644
--- a/inc/taskmanager.inc.php
+++ b/inc/taskmanager.inc.php
@@ -67,9 +67,9 @@ class Taskmanager
 		return $reply;
 	}
 
-	public static function waitComplete($task)
+	public static function waitComplete($task, $timeout = 1500)
 	{
-		if (isset($task['id'])) {
+		if (is_array($task) && isset($task['id'])) {
 			if ($task['statusCode'] !== TASK_PROCESSING && $task['statusCode'] !== TASK_WAITING) {
 				self::release($task['id']);
 				return $task;
@@ -79,7 +79,7 @@ class Taskmanager
 		if (!is_string($task))
 			return false;
 		$done = false;
-		for ($i = 0; $i < 10; ++$i) {
+		for ($i = 0; $i < ($timeout / 150); ++$i) {
 			$status = self::status($task);
 			if (!isset($status['statusCode']))
 				break;
-- 
cgit v1.2.3-55-g7522