diff options
| author | Simon Rettberg | 2016-12-20 11:02:13 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-12-20 11:02:13 +0100 |
| commit | feb7198cdcbfe5bc5014eebfb88073c4b6ef8344 (patch) | |
| tree | 872e63ed8aa92f583fd03a80af635ba8968d9f69 | |
| parent | [locations] Remove debug message (diff) | |
| download | slx-admin-feb7198cdcbfe5bc5014eebfb88073c4b6ef8344.tar.gz slx-admin-feb7198cdcbfe5bc5014eebfb88073c4b6ef8344.tar.xz slx-admin-feb7198cdcbfe5bc5014eebfb88073c4b6ef8344.zip | |
[Taskmanager] Increase default timeout of waitComplete, also timeout of RecompressArchive in CustomModule of sysconfig
| -rw-r--r-- | inc/taskmanager.inc.php | 2 | ||||
| -rw-r--r-- | 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(); |