Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 15:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust update parameters:

Browse source 
-f|--force         Force the update command (Even if the database structure matches)
-o|--override      Override running or stalling updates
This commit is contained in:
Philipp Holzer 2019-02-24 12:24:09 +01:00
parent 7ce549c294
commit aae58815a8
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
8 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Core/Update.php
View file

@ -48,18 +48,19 @@ 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) {
if ($override) {
Lock::release('dbupdate', true);
}
@ -70,12 +71,12 @@ class Update
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);
@ -126,8 +127,6 @@ class Update
Lock::release('dbupdate');
}
}
} elseif ($force) {
DBStructure::update($basePath, $verbose, true);
}
return '';