diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-10-04 20:40:30 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-10-04 20:40:30 +0530 |
| commit | e8c7f8134df38708e1af27325d2c8a7b9f28052e (patch) | |
| tree | ccc4d190b929df13110ecff6801a741f8f93c12d /phpBB/install | |
| parent | fdae60c146be5cf04dd1cbd318016a3a3301d122 (diff) | |
| parent | 3259bd1196ca2a7f77fe7060e5510813e7844ebd (diff) | |
| download | forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar.gz forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar.bz2 forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar.xz forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11883' into develop
# By Nathan (1) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11883:
[ticket/11883] Only output the migration time, not total
[ticket/11883] Report completed data step in migration as "Installing Data"
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..b79420ab71 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)); + } + 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)); } 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)); } } + 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) { |