keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Using Locks for Updating and writing last success to config

Browse source
This commit is contained in:
Philipp Holzer 2018-10-06 20:38:35 +02:00
parent e876adef8f
commit f2ca3e5be4
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 53 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Core/Update.php
View file

@ -27,10 +27,7 @@ class Update
Config::load('database'); Config::load('database');
// Compare the current structure with the defined structure // Compare the current structure with the defined structure
$t = Config::get('database', 'dbupdate_' . DB_UPDATE_VERSION); if (Lock::acquire('dbupdate')) {
if (!is_null($t)) {
return;
}
// run the pre_update_nnnn functions in update.php // run the pre_update_nnnn functions in update.php
for ($x = $stored + 1; $x <= $current; $x++) { for ($x = $stored + 1; $x <= $current; $x++) {
@ -40,8 +37,6 @@ class Update
} }
} }
Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, time());
// update the structure in one call // update the structure in one call
$retval = DBStructure::update(false, true); $retval = DBStructure::update(false, true);
if ($retval) { if ($retval) {
@ -49,9 +44,10 @@ class Update
DB_UPDATE_VERSION, DB_UPDATE_VERSION,
$retval $retval
); );
Lock::release('dbupdate');
return; return;
} else { } else {
Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success'); Config::set('database', 'last_successful_update', time());
} }
// run the update_nnnn functions in update.php // run the update_nnnn functions in update.php
@ -61,6 +57,9 @@ class Update
break; break;
} }
} }
Lock::release('dbupdate');
}
} }
} }
} }
@ -85,11 +84,7 @@ class Update
// If the update fails or times-out completely you may need to // If the update fails or times-out completely you may need to
// delete the config entry to try again. // delete the config entry to try again.
$t = Config::get('database', $funcname); if (Lock::acquire('dbupdate_function')) {
if (!is_null($t)) {
return false;
}
Config::set('database', $funcname, time());
// call the specific update // call the specific update
$retval = $funcname(); $retval = $funcname();
@ -100,18 +95,25 @@ class Update
$x, $x,
L10n::t('Update %s failed. See error logs.', $x) L10n::t('Update %s failed. See error logs.', $x)
); );
Lock::release('dbupdate_function');
return false; return false;
} else { } else {
Config::set('database', $funcname, 'success'); Config::set('database', 'last_successful_update_function', $funcname);
Config::set('database', 'last_successful_update_function_time', time());
if ($prefix == 'update') { if ($prefix == 'update') {
Config::set('system', 'build', $x); Config::set('system', 'build', $x);
} }
Lock::release('dbupdate_function');
return true; return true;
} }
}
} else { } else {
Config::set('database', $funcname, 'success'); logger('Skipping \'' . $funcname . '\' without executing', LOGGER_DEBUG);
Config::set('database', 'last_successful_update_function', $funcname);
Config::set('database', 'last_successful_update_function_time', time());
if ($prefix == 'update') { if ($prefix == 'update') {
Config::set('system', 'build', $x); Config::set('system', 'build', $x);