X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUpdate.php;h=a52ef903b2da8867854fc1660317d57817e51cec;hb=fb63274aafa176ee2eff964e809306719e80c847;hp=5df0675cdaeb46cd7520468d693e79f349b034c2;hpb=01b7a3976ff1a00700c429db43fcbdec7158abca;p=friendica.git diff --git a/src/Core/Update.php b/src/Core/Update.php index 5df0675cda..a52ef903b2 100644 --- a/src/Core/Update.php +++ b/src/Core/Update.php @@ -2,6 +2,7 @@ namespace Friendica\Core; +use Friendica\App; use Friendica\Database\DBA; use Friendica\Database\DBStructure; use Friendica\Util\Strings; @@ -14,16 +15,23 @@ class Update /** * @brief Function to check if the Database structure needs an update. * - * @param string $basePath The base path of this application - * @param boolean $via_worker boolean Is the check run via the worker? + * @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 + * * @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; } + // Don't check the status if the last update was failed + if (Config::get('system', 'update', Update::SUCCESS, true) == Update::FAILED) { + return; + } + $build = Config::get('system', 'build'); if (empty($build)) { @@ -37,9 +45,13 @@ class Update } if ($build < DB_UPDATE_VERSION) { - // When we cannot execute the database update via the worker, we will do it directly - if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) { + 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. + // This worker job doesn't work for changes to the "workerqueue" table itself. self::run($basePath); + } else { + Worker::add(PRIORITY_CRITICAL, 'DBUpdate'); } } } @@ -48,86 +60,99 @@ class Update * Automatic database updates * * @param string $basePath The base path of this application - * @param bool $force Force the Update-Check even if the lock is set + * @param bool $force Force the Update-Check even if the database version doesn't match + * @param bool $override Overrides any running/stuck updates * @param bool $verbose Run the Update-Check verbose * @param bool $sendMail Sends a Mail to the administrator in case of success/failure * * @return string Empty string if the update is successful, error messages otherwise * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function run($basePath, $force = false, $verbose = false, $sendMail = true) + public static function run($basePath, $force = false, $override = false, $verbose = false, $sendMail = true) { // In force mode, we release the dbupdate lock first // Necessary in case of an stuck update - if ($force) { - Lock::release('dbupdate'); + if ($override) { + Lock::release('dbupdate', true); } - $build = Config::get('system', 'build'); + $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 ($build != DB_UPDATE_VERSION) { + if ($build != DB_UPDATE_VERSION || $force) { require_once 'update.php'; $stored = intval($build); $current = intval(DB_UPDATE_VERSION); - if ($stored < $current) { + 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', 120, Cache::INFINITE)) { + // 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; + Config::set('system', 'update', Update::FAILED); + Lock::release('dbupdate'); + return $r; } } // update the structure in one call $retval = DBStructure::update($basePath, $verbose, true); - if ($retval) { + if (!empty($retval)) { if ($sendMail) { self::updateFailed( DB_UPDATE_VERSION, $retval ); } - Logger::log('ERROR: Update from \'' . $stored . '\' to \'' . $current . '\' - failed: ' - $retval, Logger::ALL); + Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]); + Config::set('system', 'update', Update::FAILED); 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); + 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; + Config::set('system', 'update', Update::FAILED); + 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); } + Config::set('system', 'update', Update::SUCCESS); Lock::release('dbupdate'); } } - } elseif ($force) { - DBStructure::update($basePath, $verbose, true); } return ''; @@ -146,7 +171,7 @@ class Update { $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. @@ -167,7 +192,7 @@ class Update $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 { @@ -179,12 +204,12 @@ class Update } 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()); @@ -206,19 +231,26 @@ class Update */ private static function updateFailed($update_id, $error_message) { //send the administrators an e-mail - $admin_mail_list = "'".implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))))."'"; - $adminlist = DBA::select('user', ['uid', 'language', 'email'], ['`email` IN (%s)', $admin_mail_list]); + $condition = ['email' => explode(",", str_replace(" ", "", 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 = []; + // every admin could had different language - foreach ($adminlist as $admin) { + while ($admin = DBA::fetch($adminlist)) { + if (in_array($admin['email'], $sent)) { + continue; + } + $sent[] = $admin['email']; + $lang = (($admin['language'])?$admin['language']:'en'); L10n::pushLang($lang); @@ -234,6 +266,7 @@ class Update 'uid' => $admin['uid'], 'type' => SYSTEM_EMAIL, 'to_email' => $admin['email'], + 'subject' => l10n::t('[Friendica Notify] Database update'), 'preamble' => $preamble, 'body' => $body, 'language' => $lang] @@ -242,18 +275,25 @@ class Update } //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 - $admin_mail_list = "'".implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))))."'"; - $adminlist = DBA::select('user', ['uid', 'language', 'email'], ['`email` IN (%s)', $admin_mail_list]); + $condition = ['email' => explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))), 'parent-uid' => 0]; + $adminlist = DBA::select('user', ['uid', 'language', 'email'], $condition, ['order' => ['uid']]); if (DBA::isResult($adminlist)) { + $sent = []; + // every admin could had different language - foreach ($adminlist as $admin) { + while ($admin = DBA::fetch($adminlist)) { + if (in_array($admin['email'], $sent)) { + continue; + } + $sent[] = $admin['email']; + $lang = (($admin['language']) ? $admin['language'] : 'en'); L10n::pushLang($lang); @@ -265,6 +305,7 @@ class Update 'uid' => $admin['uid'], 'type' => SYSTEM_EMAIL, 'to_email' => $admin['email'], + 'subject' => l10n::t('[Friendica Notify] Database update'), 'preamble' => $preamble, 'body' => $preamble, 'language' => $lang] @@ -274,6 +315,6 @@ class Update } //try the logger - Logger::log("Database structure update successful.", Logger::TRACE); + Logger::debug('Database structure update successful.'); } }