return;
}
- $build = self::getBuild();
- $current = intval(DB_UPDATE_VERSION);
+ $build = Config::get('system', 'build');
+
+ if (empty($build)) {
+ Config::set('system', 'build', DB_UPDATE_VERSION - 1);
+ $build = DB_UPDATE_VERSION - 1;
+ }
// We don't support upgrading from very old versions anymore
if ($build < NEW_UPDATE_ROUTINE_VERSION) {
die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
}
- if ($build < $current ) {
+ if ($build < DB_UPDATE_VERSION) {
if ($via_worker) {
// Calling the database update directly via the worker enables us to perform database changes to the workerqueue table itself.
// This is a fallback, since normally the database update will be performed by a worker job.
Lock::release('dbupdate', true);
}
- $current = intval(DB_UPDATE_VERSION);
- $stored = self::getBuild();
+ $build = Config::get('system', 'build', null, true);
+
+ if (empty($build) || ($build > DB_UPDATE_VERSION)) {
+ $build = DB_UPDATE_VERSION - 1;
+ Config::set('system', 'build', $build);
+ }
- if ($stored < $current || $force) {
+ if ($build != DB_UPDATE_VERSION || $force) {
require_once 'update.php';
- Config::load('database');
+ $stored = intval($build);
+ $current = intval(DB_UPDATE_VERSION);
+ if ($stored < $current || $force) {
+ Config::load('database');
- Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - starting', Logger::DEBUG);
+ Logger::info('Update starting.', ['from' => $stored, 'to' => $current]);
- // Compare the current structure with the defined structure
- // If the Lock is acquired, never release it automatically to avoid double updates
- if (Lock::acquire('dbupdate', 0, Cache::INFINITE)) {
+ // Compare the current structure with the defined structure
+ // If the Lock is acquired, never release it automatically to avoid double updates
+ if (Lock::acquire('dbupdate', 120, Cache::INFINITE)) {
- // recheck again in case we accidentally spawned multiple updates
- $stored = intval(self::getBuild());
- if ($stored >= $current) {
- Lock::release('dbupdate');
- return '';
- }
+ // Checks if the build changed during Lock acquiring (so no double update occurs)
+ $retryBuild = Config::get('system', 'build', null, true);
+ if ($retryBuild !== $build) {
+ Logger::info('Update already done.', ['from' => $stored, 'to' => $current]);
+ Lock::release('dbupdate');
+ return '';
+ }
- // run the pre_update_nnnn functions in update.php
- for ($x = $stored + 1; $x <= $current; $x++) {
- $r = self::runUpdateFunction($x, 'pre_update');
- if (!$r) {
- break;
+ // run the pre_update_nnnn functions in update.php
+ for ($x = $stored + 1; $x <= $current; $x++) {
+ $r = self::runUpdateFunction($x, 'pre_update');
+ if (!$r) {
+ break;
+ }
}
- }
- // update the structure in one call
- $retval = DBStructure::update($basePath, $verbose, true);
- if (!empty($retval)) {
- if ($sendMail) {
- self::updateFailed(
- DB_UPDATE_VERSION,
- $retval
- );
+ // update the structure in one call
+ $retval = DBStructure::update($basePath, $verbose, true);
+ if (!empty($retval)) {
+ if ($sendMail) {
+ self::updateFailed(
+ DB_UPDATE_VERSION,
+ $retval
+ );
+ }
+ Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]);
+ Lock::release('dbupdate');
+ return $retval;
+ } else {
+ Config::set('database', 'last_successful_update', $current);
+ Config::set('database', 'last_successful_update_time', time());
+ Logger::info('Update finished.', ['from' => $stored, 'to' => $current]);
}
- Logger::log('ERROR: Update from \'' . $stored . '\' to \'' . $current . '\' - failed: ' - $retval, Logger::ALL);
- Lock::release('dbupdate');
- return $retval;
- } else {
- Config::set('database', 'last_successful_update', $current);
- Config::set('database', 'last_successful_update_time', time());
- Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - finished', Logger::DEBUG);
- }
- // run the update_nnnn functions in update.php
- for ($x = $stored + 1; $x <= $current; $x++) {
- $r = self::runUpdateFunction($x, 'update');
- if (!$r) {
- break;
+ // run the update_nnnn functions in update.php
+ for ($x = $stored + 1; $x <= $current; $x++) {
+ $r = self::runUpdateFunction($x, 'update');
+ if (!$r) {
+ break;
+ }
}
- }
- Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - successful', Logger::DEBUG);
- if ($sendMail) {
- self::updateSuccessfull($stored, $current);
- }
+ Logger::notice('Update success.', ['from' => $stored, 'to' => $current]);
+ if ($sendMail) {
+ self::updateSuccessfull($stored, $current);
+ }
- Lock::release('dbupdate');
+ Lock::release('dbupdate');
+ }
}
}
{
$funcname = $prefix . '_' . $x;
- Logger::log('Update function \'' . $funcname . '\' - start', Logger::DEBUG);
+ Logger::info('Update function start.', ['function' => $funcname]);
if (function_exists($funcname)) {
// There could be a lot of processes running or about to run.
$x,
L10n::t('Update %s failed. See error logs.', $x)
);
- Logger::log('ERROR: Update function \'' . $funcname . '\' - failed: ' . $retval, Logger::ALL);
+ Logger::error('Update function ERROR.', ['function' => $funcname, 'retval' => $retval]);
Lock::release('dbupdate_function');
return false;
} else {
}
Lock::release('dbupdate_function');
- Logger::log('Update function \'' . $funcname . '\' - finished', Logger::DEBUG);
+ Logger::info('Update function finished.', ['function' => $funcname]);
return true;
}
}
} else {
- Logger::log('Skipping \'' . $funcname . '\' without executing', Logger::DEBUG);
+ Logger::info('Update function skipped.', ['function' => $funcname]);
Config::set('database', 'last_successful_update_function', $funcname);
Config::set('database', 'last_successful_update_function_time', time());
// No valid result?
if (!DBA::isResult($adminlist)) {
- Logger::log(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), Logger::INFO);
+ Logger::warning('Cannot notify administrators .', ['update' => $update_id, 'message' => $error_message]);
// Don't continue
return;
}
//try the logger
- Logger::log("CRITICAL: Database structure update failed: " . $error_message);
+ Logger::alert('Database structure update FAILED.', ['error' => $error_message]);
}
private static function updateSuccessfull($from_build, $to_build)
}
//try the logger
- Logger::log("Database structure update successful.", Logger::TRACE);
- }
-
- /**
- * Returns the current build number of the instance
- *
- * @return int the build number
- */
- private static function getBuild()
- {
- $build = Config::get('system', 'build');
-
- if (empty($build) || ($build > DB_UPDATE_VERSION)) {
- $build = DB_UPDATE_VERSION - 1;
- Config::set('system', 'build', $build);
- }
-
- return (is_int($build) ? intval($build) : DB_UPDATE_VERSION - 1);
+ Logger::debug('Database structure update successful.');
}
}
projects / friendica.git / blobdiff