diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2016-02-11 13:18:30 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2016-02-12 14:31:28 +0100 |
| commit | 955b9ede33c5696173a760ea271ec32d79e843b9 (patch) | |
| tree | eaff0198ca89ed5b6d76ee56b797a105837226d2 /phpBB/phpbb/install/module/requirements | |
| parent | 0210a6298d9dd39ddb15a1e0b8f49f7821cd460f (diff) | |
| download | forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar.gz forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar.bz2 forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar.xz forums-955b9ede33c5696173a760ea271ec32d79e843b9.zip | |
[ticket/14462] Further speed improvements
- Cache the secondary container
- Only initialize tasks/modules that are being used
- Add timeout error message in the AJAX UI
PHPBB3-14462
Diffstat (limited to 'phpBB/phpbb/install/module/requirements')
| -rw-r--r-- | phpBB/phpbb/install/module/requirements/abstract_requirements_module.php | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/phpBB/phpbb/install/module/requirements/abstract_requirements_module.php b/phpBB/phpbb/install/module/requirements/abstract_requirements_module.php index 26593e6777..121b4ff4e5 100644 --- a/phpBB/phpbb/install/module/requirements/abstract_requirements_module.php +++ b/phpBB/phpbb/install/module/requirements/abstract_requirements_module.php @@ -13,7 +13,6 @@ namespace phpbb\install\module\requirements; -use phpbb\install\exception\resource_limit_reached_exception; use phpbb\install\exception\user_interaction_required_exception; use phpbb\install\module_base; @@ -25,41 +24,8 @@ abstract class abstract_requirements_module extends module_base public function run() { $tests_passed = true; - - // Recover install progress - $task_name = $this->recover_progress(); - $task_found = false; - - /** - * @var string $name ID of the service - * @var \phpbb\install\task_interface $task Task object - */ foreach ($this->task_collection as $name => $task) { - // Run until there are available resources - if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0) - { - throw new resource_limit_reached_exception(); - } - - // Skip forward until the next task is reached - if (!$task_found) - { - if ($name === $task_name || empty($task_name)) - { - $task_found = true; - - if ($name === $task_name) - { - continue; - } - } - else - { - continue; - } - } - // Check if we can run the task if (!$task->is_essential() && !$task->check_requirements()) { @@ -76,7 +42,7 @@ abstract class abstract_requirements_module extends module_base } // Module finished, so clear task progress - $this->install_config->set_finished_task(''); + $this->install_config->set_finished_task(0); // Check if tests have failed if (!$tests_passed) @@ -91,7 +57,6 @@ abstract class abstract_requirements_module extends module_base )); // Send the response and quit - $this->iohandler->send_response(); throw new user_interaction_required_exception(); } } |