From feb7198cdcbfe5bc5014eebfb88073c4b6ef8344 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Dec 2016 11:02:13 +0100
Subject: [Taskmanager] Increase default timeout of waitComplete, also timeout
 of RecompressArchive in CustomModule of sysconfig

---
 inc/taskmanager.inc.php                                    | 2 +-
 modules-available/sysconfig/addmodule_custommodule.inc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php
index bd60e8ae..1920190f 100644
--- a/inc/taskmanager.inc.php
+++ b/inc/taskmanager.inc.php
@@ -100,7 +100,7 @@ class Taskmanager
 	 * @param int $timeout maximum time in ms to wait for completion of task
 	 * @return array result/status of task, or false if it couldn't be queried
 	 */
-	public static function waitComplete($task, $timeout = 1500)
+	public static function waitComplete($task, $timeout = 2500)
 	{
 		if (is_array($task) && isset($task['id'])) {
 			if ($task['statusCode'] !== TASK_PROCESSING && $task['statusCode'] !== TASK_WAITING) {
diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php
index 3f112c95..7c3ccf0f 100644
--- a/modules-available/sysconfig/addmodule_custommodule.inc.php
+++ b/modules-available/sysconfig/addmodule_custommodule.inc.php
@@ -123,7 +123,7 @@ class CustomModule_CompressModule extends AddModule_Base
 			'inputFiles' => array($tempfile),
 			'outputFile' => $destFile
 		), true);
-		$status = Taskmanager::waitComplete($this->taskId);
+		$status = Taskmanager::waitComplete($this->taskId, 5000);
 		unlink($tempfile);
 		if (!isset($status['statusCode'])) {
 			$this->tmError();
-- 
cgit v1.2.3-55-g7522