makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14492] Prevent timeouts in install & update extensions tasks

Browse source 
PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-03-04 17:27:27 +01:00
parent edfc4f3efc
commit b1596fda7f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/phpbb/install/module/install_finish/task/install_extensions.php
View file

@ -13,6 +13,8 @@
namespace phpbb\install\module\install_finish\task; namespace phpbb\install\module\install_finish\task;
use phpbb\install\exception\resource_limit_reached_exception;
/** /**
* Installs extensions that exist in ext folder upon install * Installs extensions that exist in ext folder upon install
*/ */
@ -102,7 +104,9 @@ class install_extensions extends \phpbb\install\task_base
$install_extensions = $this->iohandler->get_input('install-extensions', array()); $install_extensions = $this->iohandler->get_input('install-extensions', array());
$available_extensions = $this->extension_manager->all_available(); $all_available_extensions = $this->extension_manager->all_available();
$i = $this->install_config->get('install_extensions_index', 0);
$available_extensions = array_slice($all_available_extensions, $i);
// Install extensions // Install extensions
foreach ($available_extensions as $ext_name => $ext_path) foreach ($available_extensions as $ext_name => $ext_path)
@ -133,6 +137,21 @@ class install_extensions extends \phpbb\install\task_base
// Add fail log and continue // Add fail log and continue
$this->iohandler->add_log_message(array('CLI_EXTENSION_ENABLE_FAILURE', $ext_name)); $this->iohandler->add_log_message(array('CLI_EXTENSION_ENABLE_FAILURE', $ext_name));
} }
$i++;
// Stop execution if resource limit is reached
if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0)
{
break;
}
}
$this->install_config->set('install_extensions_index', $i);
if ($i < sizeof($all_available_extensions))
{
throw new resource_limit_reached_exception();
} }
} }

20
phpBB/phpbb/install/module/update_database/task/update_extensions.php
View file

@ -13,6 +13,7 @@
namespace phpbb\install\module\update_database\task; namespace phpbb\install\module\update_database\task;
use phpbb\install\exception\resource_limit_reached_exception;
use phpbb\install\helper\container_factory; use phpbb\install\helper\container_factory;
use phpbb\install\helper\config; use phpbb\install\helper\config;
use phpbb\install\helper\iohandler\iohandler_interface; use phpbb\install\helper\iohandler\iohandler_interface;
@ -143,7 +144,9 @@ class update_extensions extends task_base
} }
} }
$available_extensions = $this->extension_manager->all_available(); $all_available_extensions = $this->extension_manager->all_available();
$i = $this->install_config->get('update_extensions_index', 0);
$available_extensions = array_slice($all_available_extensions, $i);
// Update available extensions // Update available extensions
foreach ($available_extensions as $ext_name => $ext_path) foreach ($available_extensions as $ext_name => $ext_path)
@ -190,6 +193,21 @@ class update_extensions extends task_base
$this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name)); $this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name));
} }
} }
$i++;
// Stop execution if resource limit is reached
if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0)
{
break;
}
}
$this->install_config->set('update_extensions_index', $i);
if ($i < sizeof($all_available_extensions))
{
throw new resource_limit_reached_exception();
} }
} }