X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUpdate.php;h=978baec10f871b55f3f2de2596f4787dde30be81;hb=4724000d06cd47bd5eee97111f2723962007d3dc;hp=2758b6f49e7afad21084920f640d4f9c55ad0ce3;hpb=ee5207410c71492b2e771479ff1890d8ef4552da;p=friendica.git

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 2758b6f49e..978baec10f 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,6 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
 class Update
@@ -63,7 +64,7 @@ class Update
 
 		// We don't support upgrading from very old versions anymore
 		if ($build < NEW_TABLE_STRUCTURE_VERSION) {
-			$error = DI::l10n('Updates from version %s are not supported. Please update at least to version 2021,01 and wait until the postupdate finished version 1383.', $build);
+			$error = DI::l10n()->t('Updates from version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.', $build);
 			if (DI::mode()->getExecutor() == Mode::INDEX) {
 				die($error);
 			} else {
@@ -71,10 +72,10 @@ class Update
 			}
 		}
 
-		// The postupdate has to completed version 1281 for the new post views to take over
-		$postupdate = DI::config()->get("system", "post_update_version");
+		// The postupdate has to completed version 1288 for the new post views to take over
+		$postupdate = DI::config()->get("system", "post_update_version", NEW_TABLE_STRUCTURE_VERSION);
 		if ($postupdate < NEW_TABLE_STRUCTURE_VERSION) {
-			$error = DI::l10n('Updates from postupdate version %s are not supported. Please update at least to version 2021,01 and wait until the postupdate finished version 1383.', $postupdate);
+			$error = DI::l10n()->t('Updates from postupdate version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.', $postupdate);
 			if (DI::mode()->getExecutor() == Mode::INDEX) {
 				die($error);
 			} else {
@@ -131,7 +132,7 @@ class Update
 
 				// Compare the current structure with the defined structure
 				// If the Lock is acquired, never release it automatically to avoid double updates
-				if (DI::lock()->acquire('dbupdate', 0, Cache\Duration::INFINITE)) {
+				if (DI::lock()->acquire('dbupdate', 0, Cache\Enum\Duration::INFINITE)) {
 
 					Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
 
@@ -143,14 +144,20 @@ class Update
 						return '';
 					}
 
+					DI::config()->set('system', 'maintenance', 1);
+		
 					// run the pre_update_nnnn functions in update.php
 					for ($version = $stored + 1; $version <= $current; $version++) {
 						Logger::notice('Execute pre update.', ['version' => $version]);
+						DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: executing pre update %d',
+							DateTimeFormat::utcNow() . ' ' . date('e'), $version));
 						$r = self::runUpdateFunction($version, 'pre_update', $sendMail);
 						if (!$r) {
 							Logger::warning('Pre update failed', ['version' => $version]);
 							DI::config()->set('system', 'update', Update::FAILED);
 							DI::lock()->release('dbupdate');
+							DI::config()->set('system', 'maintenance', 0);
+							DI::config()->set('system', 'maintenance_reason', '');
 							return $r;
 						} else {
 							Logger::notice('Pre update executed.', ['version' => $version]);
@@ -159,7 +166,7 @@ class Update
 
 					// update the structure in one call
 					Logger::notice('Execute structure update');
-					$retval = DBStructure::update($basePath, $verbose, true);
+					$retval = DBStructure::performUpdate(false, $verbose);
 					if (!empty($retval)) {
 						if ($sendMail) {
 							self::updateFailed(
@@ -170,6 +177,8 @@ class Update
 						Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]);
 						DI::config()->set('system', 'update', Update::FAILED);
 						DI::lock()->release('dbupdate');
+						DI::config()->set('system', 'maintenance', 0);
+						DI::config()->set('system', 'maintenance_reason', '');
 						return $retval;
 					} else {
 						Logger::notice('Database structure update finished.', ['from' => $stored, 'to' => $current]);
@@ -178,11 +187,15 @@ class Update
 					// run the update_nnnn functions in update.php
 					for ($version = $stored + 1; $version <= $current; $version++) {
 						Logger::notice('Execute post update.', ['version' => $version]);
+						DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: executing post update %d',
+							DateTimeFormat::utcNow() . ' ' . date('e'), $version));
 						$r = self::runUpdateFunction($version, 'update', $sendMail);
 						if (!$r) {
 							Logger::warning('Post update failed', ['version' => $version]);
 							DI::config()->set('system', 'update', Update::FAILED);
 							DI::lock()->release('dbupdate');
+							DI::config()->set('system', 'maintenance', 0);
+							DI::config()->set('system', 'maintenance_reason', '');
 							return $r;
 						} else {
 							DI::config()->set('system', 'build', $version);
@@ -193,11 +206,15 @@ class Update
 					DI::config()->set('system', 'build', $current);
 					DI::config()->set('system', 'update', Update::SUCCESS);
 					DI::lock()->release('dbupdate');
+					DI::config()->set('system', 'maintenance', 0);
+					DI::config()->set('system', 'maintenance_reason', '');
 
 					Logger::notice('Update success.', ['from' => $stored, 'to' => $current]);
 					if ($sendMail) {
 						self::updateSuccessful($stored, $current);
 					}
+				} else {
+					Logger::warning('Update lock could not be acquired');
 				}
 			}
 		}
@@ -229,7 +246,7 @@ class Update
 			// If the update fails or times-out completely you may need to
 			// delete the config entry to try again.
 
-			if (DI::lock()->acquire('dbupdate_function', 120, Cache\Duration::INFINITE)) {
+			if (DI::lock()->acquire('dbupdate_function', 120, Cache\Enum\Duration::INFINITE)) {
 
 				// call the specific update
 				Logger::notice('Pre update function start.', ['function' => $funcname]);