diff options
| author | Nathan <nathaniel.guse@gmail.com> | 2013-10-02 14:27:46 -0500 |
|---|---|---|
| committer | Nathan <nathaniel.guse@gmail.com> | 2013-10-02 14:27:46 -0500 |
| commit | 621e6c93ed5517cedbf7a6a37c35786a1e2f27e8 (patch) | |
| tree | 58fbec041af7239c6799aa3ba5694515af22525c /phpBB/install | |
| parent | 49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (diff) | |
| download | forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar.gz forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar.bz2 forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar.xz forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.zip | |
[ticket/11883] Report completed data step in migration as "Installing Data"
PHPBB3-11883
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index fa8ec6b6ce..d846884399 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -207,6 +207,8 @@ $safe_time_limit = (ini_get('max_execution_time') / 2); while (!$migrator->finished()) { + $migration_start_time = microtime(true); + try { $migrator->update(); @@ -227,20 +229,26 @@ while (!$migrator->finished()) if (isset($migrator->last_run_migration['effectively_installed']) && $migrator->last_run_migration['effectively_installed']) { - echo $user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $migrator->last_run_migration['name']) . '<br />'; + echo $user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $migrator->last_run_migration['name']); } else { - if ($state['migration_data_done']) + if ($migrator->last_run_migration['task'] == 'process_data_step' && $state['migration_data_done']) + { + echo $user->lang('MIGRATION_DATA_DONE', $migrator->last_run_migration['name'], (microtime(true) - $migration_start_time), (time() - $update_start_time)); + } + else if ($migrator->last_run_migration['task'] == 'process_data_step') { - echo $user->lang('MIGRATION_DATA_DONE', $migrator->last_run_migration['name']) . '<br />'; + echo $user->lang('MIGRATION_DATA_IN_PROGRESS', $migrator->last_run_migration['name'], (microtime(true) - $migration_start_time), (time() - $update_start_time)); } else if ($state['migration_schema_done']) { - echo $user->lang('MIGRATION_SCHEMA_DONE', $migrator->last_run_migration['name']) . '<br />'; + echo $user->lang('MIGRATION_SCHEMA_DONE', $migrator->last_run_migration['name'], (microtime(true) - $migration_start_time), (time() - $update_start_time)); } } + echo "<br />\n"; + // Are we approaching the time limit? If so we want to pause the update and continue after refreshing if ((time() - $update_start_time) >= $safe_time_limit) { |