X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUpdate.php;h=a52ef903b2da8867854fc1660317d57817e51cec;hb=8146ff150530fc742720b6c03f6f419260013484;hp=b849b4c151ecff67eb58a58ee441407c2acc4815;hpb=e46a7cdf80e4b6b51adc7df2dd77918f7eb5b1da;p=friendica.git

diff --git a/src/Core/Update.php b/src/Core/Update.php
index b849b4c151..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)) {
@@ -68,67 +76,82 @@ class Update
 			Lock::release('dbupdate', true);
 		}
 
-		$current = intval(DB_UPDATE_VERSION);
-		$stored = self::getBuild();
+		$build = Config::get('system', 'build', null, true);
 
-		if ($stored < $current || $force) {
+		if (empty($build) || ($build > DB_UPDATE_VERSION)) {
+			$build = DB_UPDATE_VERSION - 1;
+			Config::set('system', 'build', $build);
+		}
+
+		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) {
+							Config::set('system', 'update', Update::FAILED);
+							Lock::release('dbupdate');
+							return $r;
+						}
 					}
-				}
 
-				// 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]);
+						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::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) {
+							Config::set('system', 'update', Update::FAILED);
+							Lock::release('dbupdate');
+							return $r;
+						}
 					}
-				}
 
-				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');
+					Config::set('system', 'update', Update::SUCCESS);
+					Lock::release('dbupdate');
+				}
 			}
 		}
 
@@ -148,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.
@@ -169,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 {
@@ -181,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());
@@ -213,7 +236,7 @@ class Update
 
 		// 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;
@@ -243,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]
@@ -251,7 +275,7 @@ 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)
@@ -281,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]
@@ -290,18 +315,6 @@ class Update
 		}
 
 		//try the logger
-		Logger::log("Database structure update successful.", Logger::TRACE);
-	}
-
-	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.');
 	}
 }