mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add repair step to remove .step file after update 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2016-09-23 13:38:37 +02:00
parent 8c133451ac
commit 2fb10ce629
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/repair.php
View File

@ -41,6 +41,7 @@ use OC\Repair\CopyRewriteBaseToConfig;
use OC\Repair\DropOldJobs;
use OC\Repair\EncryptionCompatibility;
use OC\Repair\MoveChannelToSystemConfig;
use OC\Repair\MoveUpdaterStepFile;
use OC\Repair\OldGroupMembershipShares;
use OC\Repair\RemoveGetETagEntries;
use OC\Repair\SqliteAutoincrement;
@ -123,6 +124,7 @@ class Repair extends BasicEmitter {
new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
new AvatarPermissions(\OC::$server->getDatabaseConnection()),
new MoveChannelToSystemConfig(\OC::$server->getConfig()),
new MoveUpdaterStepFile(\OC::$server->getConfig()),
];
}

81
lib/private/repair/moveupdaterstepfile.php Normal file
View File

@ -0,0 +1,81 @@
<?php
/**
* @copyright Copyright (c) 2016 Morris Jobke <hey@morrisjobke.de>
*
* @author Morris Jobke <hey@morrisjobke.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Repair;
use OC\Hooks\BasicEmitter;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
class MoveUpdaterStepFile extends BasicEmitter implements \OC\RepairStep {
/** @var \OCP\IConfig */
protected $config;
/**
* @param \OCP\IConfig $config
*/
public function __construct($config) {
$this->config = $config;
}
public function getName() {
return 'Move .step file of updater to backup location';
}
public function run() {
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT);
$instanceId = $this->config->getSystemValue('instanceid', null);
if(!is_string($instanceId) || empty($instanceId)) {
return;
}
$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
$stepFile = $updaterFolderPath . '/.step';
if(file_exists($stepFile)) {
$this->emit('\OC\Repair', 'info', array('.step file exists'));
$previousStepFile = $updaterFolderPath . '/.step-previous-update';
// cleanup
if(file_exists($previousStepFile)) {
if(\OC_Helper::rmdirr($previousStepFile)) {
$this->emit('\OC\Repair', 'info', array('.step-previous-update removed'));
} else {
$this->emit('\OC\Repair', 'info', array('.step-previous-update can\'t be removed - abort move of .step file'));
return;
}
}
// move step file
if(rename($stepFile, $previousStepFile)) {
$this->emit('\OC\Repair', 'info', array('.step file moved to .step-previous-update'));
} else {
$this->emit('\OC\Repair', 'warning', array('.step file can\'t be moved'));
}
}
}
}