diff --git a/application/controllers/Debug.php b/application/controllers/Debug.php index 54115cb98..e9af0827a 100644 --- a/application/controllers/Debug.php +++ b/application/controllers/Debug.php @@ -42,9 +42,11 @@ class Debug extends CI_Controller // get mig version from config file $this->load->config('migration'); $data['migration_config'] = $this->config->item('migration_version'); + $data['migration_lockfile'] = $this->config->item('migration_lockfile'); + $data['miglock_lifetime'] = $this->config->item('migration_lf_maxage'); // compare mig versions - if ($data['migration_version'] !== $data['migration_config'] && file_exists('application/cache/.migration_running')) { + if ($data['migration_version'] != $data['migration_config'] && file_exists($data['migration_lockfile'])) { $data['migration_is_uptodate'] = false; } else { $data['migration_is_uptodate'] = true; diff --git a/application/views/debug/index.php b/application/views/debug/index.php index 22ec83cce..9e0642e2e 100644 --- a/application/views/debug/index.php +++ b/application/views/debug/index.php @@ -40,14 +40,15 @@
= sprintf(__("The current migration is not the version it is supposed to be. Reload this page. If this warning persists, your migration is probably locked due to a past failed process. Check the folder %s for a file called %s and remove this file to force the migration to run again."), "'application/cache/'", "'.migration_running'"); ?>
-= sprintf(__("Current migration is %s"), $migration_version); ?>
- = sprintf(__("Migration should be %s"), $migration_config); ?>
= sprintf(__("The current migration is not the version it is supposed to be. Reload this page after %s seconds. If this warning persists, your migration is likely locked due to a previously failed process. Delete the file %s to force the migration to run again."), $miglock_lifetime, $migration_lockfile); ?>
+= sprintf(__("Check this wiki article here for more information."), "https://github.com/wavelog/wavelog/wiki/Migration-is-locked"); ?>
+= sprintf(__("Current migration is %s"), $migration_version); ?>
+ = sprintf(__("Migration should be %s"), $migration_config); ?>
| = __("Environment"); ?> |