namespace Friendica\Core;
+use Friendica\App;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\DI;
use Friendica\Util\Strings;
class Update
const FAILED = 1;
/**
- * @brief Function to check if the Database structure needs an update.
+ * Function to check if the Database structure needs an update.
+ *
+ * @param string $basePath The base path of this application
+ * @param boolean $via_worker Is the check run via the worker?
+ * @param App\Mode $mode The current app mode
*
- * @param string $basePath The base path of this application
- * @param boolean $via_worker boolean Is the check run via the worker?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function check($basePath, $via_worker)
+ public static function check($basePath, $via_worker, App\Mode $mode)
{
if (!DBA::connected()) {
return;
}
- $build = Config::get('system', 'build');
+ // Don't check the status if the last update was failed
+ if (DI::config()->get('system', 'update', Update::SUCCESS, true) == Update::FAILED) {
+ return;
+ }
+
+ $build = DI::config()->get('system', 'build');
if (empty($build)) {
- Config::set('system', 'build', DB_UPDATE_VERSION - 1);
+ DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1);
$build = DB_UPDATE_VERSION - 1;
}
// In force mode, we release the dbupdate lock first
// Necessary in case of an stuck update
if ($override) {
- Lock::release('dbupdate', true);
+ DI::lock()->release('dbupdate', true);
}
- $build = Config::get('system', 'build');
+ $build = DI::config()->get('system', 'build', null, true);
if (empty($build) || ($build > DB_UPDATE_VERSION)) {
$build = DB_UPDATE_VERSION - 1;
- Config::set('system', 'build', $build);
+ DI::config()->set('system', 'build', $build);
}
if ($build != DB_UPDATE_VERSION || $force) {
$stored = intval($build);
$current = intval(DB_UPDATE_VERSION);
if ($stored < $current || $force) {
- Config::load('database');
+ DI::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', 120, Cache::INFINITE)) {
+ if (DI::lock()->acquire('dbupdate', 120, Cache\Duration::INFINITE)) {
+
+ // Checks if the build changed during Lock acquiring (so no double update occurs)
+ $retryBuild = DI::config()->get('system', 'build', null, true);
+ if ($retryBuild !== $build) {
+ Logger::info('Update already done.', ['from' => $stored, 'to' => $current]);
+ DI::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;
+ DI::config()->set('system', 'update', Update::FAILED);
+ DI::lock()->release('dbupdate');
+ return $r;
}
}
$retval
);
}
- Logger::log('ERROR: Update from \'' . $stored . '\' to \'' . $current . '\' - failed: ' - $retval, Logger::ALL);
- Lock::release('dbupdate');
+ Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]);
+ DI::config()->set('system', 'update', Update::FAILED);
+ DI::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);
+ DI::config()->set('database', 'last_successful_update', $current);
+ DI::config()->set('database', 'last_successful_update_time', time());
+ Logger::info('Update finished.', ['from' => $stored, 'to' => $current]);
}
// run the update_nnnn functions in update.php
for ($x = $stored + 1; $x <= $current; $x++) {
$r = self::runUpdateFunction($x, 'update');
if (!$r) {
- break;
+ DI::config()->set('system', 'update', Update::FAILED);
+ DI::lock()->release('dbupdate');
+ return $r;
}
}
- Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - successful', Logger::DEBUG);
+ Logger::notice('Update success.', ['from' => $stored, 'to' => $current]);
if ($sendMail) {
self::updateSuccessfull($stored, $current);
}
- Lock::release('dbupdate');
+ DI::config()->set('system', 'update', Update::SUCCESS);
+ DI::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.
// If the update fails or times-out completely you may need to
// delete the config entry to try again.
- if (Lock::acquire('dbupdate_function', 120,Cache::INFINITE)) {
+ if (DI::lock()->acquire('dbupdate_function', 120, Cache\Duration::INFINITE)) {
// call the specific update
$retval = $funcname();
//send the administrator an e-mail
self::updateFailed(
$x,
- L10n::t('Update %s failed. See error logs.', $x)
+ DI::l10n()->t('Update %s failed. See error logs.', $x)
);
- Logger::log('ERROR: Update function \'' . $funcname . '\' - failed: ' . $retval, Logger::ALL);
- Lock::release('dbupdate_function');
+ Logger::error('Update function ERROR.', ['function' => $funcname, 'retval' => $retval]);
+ DI::lock()->release('dbupdate_function');
return false;
} else {
- Config::set('database', 'last_successful_update_function', $funcname);
- Config::set('database', 'last_successful_update_function_time', time());
+ DI::config()->set('database', 'last_successful_update_function', $funcname);
+ DI::config()->set('database', 'last_successful_update_function_time', time());
if ($prefix == 'update') {
- Config::set('system', 'build', $x);
+ DI::config()->set('system', 'build', $x);
}
- Lock::release('dbupdate_function');
- Logger::log('Update function \'' . $funcname . '\' - finished', Logger::DEBUG);
+ DI::lock()->release('dbupdate_function');
+ 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());
+ DI::config()->set('database', 'last_successful_update_function', $funcname);
+ DI::config()->set('database', 'last_successful_update_function_time', time());
if ($prefix == 'update') {
- Config::set('system', 'build', $x);
+ DI::config()->set('system', 'build', $x);
}
return true;
*/
private static function updateFailed($update_id, $error_message) {
//send the administrators an e-mail
- $condition = ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))), 'parent-uid' => 0];
+ $condition = ['email' => explode(",", str_replace(" ", "", DI::config()->get('config', 'admin_email'))), 'parent-uid' => 0];
$adminlist = DBA::select('user', ['uid', 'language', 'email'], $condition, ['order' => ['uid']]);
// 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;
$sent[] = $admin['email'];
$lang = (($admin['language'])?$admin['language']:'en');
- L10n::pushLang($lang);
+ $l10n = DI::l10n()->withLang($lang);
- $preamble = Strings::deindent(L10n::t("
+ $preamble = Strings::deindent($l10n->t("
The friendica developers released update %s recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and I can't do it alone. Please contact a
friendica developer if you can not help me on your own. My database might be invalid.",
$update_id));
- $body = L10n::t("The error message is\n[pre]%s[/pre]", $error_message);
+ $body = $l10n->t("The error message is\n[pre]%s[/pre]", $error_message);
notification([
'uid' => $admin['uid'],
'type' => SYSTEM_EMAIL,
'to_email' => $admin['email'],
+ 'subject' => $l10n->t('[Friendica Notify] Database update'),
'preamble' => $preamble,
'body' => $body,
'language' => $lang]
);
- L10n::popLang();
}
//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)
{
//send the administrators an e-mail
- $condition = ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))), 'parent-uid' => 0];
+ $condition = ['email' => explode(",", str_replace(" ", "", DI::config()->get('config', 'admin_email'))), 'parent-uid' => 0];
$adminlist = DBA::select('user', ['uid', 'language', 'email'], $condition, ['order' => ['uid']]);
if (DBA::isResult($adminlist)) {
$sent[] = $admin['email'];
$lang = (($admin['language']) ? $admin['language'] : 'en');
- L10n::pushLang($lang);
+ $l10n = DI::l10n()->withLang($lang);
- $preamble = Strings::deindent(L10n::t("
+ $preamble = Strings::deindent($l10n->t("
The friendica database was successfully updated from %s to %s.",
$from_build, $to_build));
'uid' => $admin['uid'],
'type' => SYSTEM_EMAIL,
'to_email' => $admin['email'],
+ 'subject' => DI::l10n()->t('[Friendica Notify] Database update'),
'preamble' => $preamble,
'body' => $preamble,
'language' => $lang]
);
- L10n::popLang();
}
}
//try the logger
- Logger::log("Database structure update successful.", Logger::TRACE);
+ Logger::debug('Database structure update successful.');
}
}
projects / friendica.git / blobdiff