Skip to content

fixed issue of Backup tool not correctly detecting .maintenance.flag #19993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 23, 2019
Merged

fixed issue of Backup tool not correctly detecting .maintenance.flag #19993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd92027
Resolve issue of Backup tool not correctly detecting .maintenance.flag
hiren0241 Apr 18, 2019
6374f9d
Resolve Rollback issue
hiren0241 Apr 18, 2019
658b5a7
Merge remote-tracking branch 'mainline/2.3-develop' into fixed-issue-…
nmalevanec Apr 19, 2019
5bc05b2
Fix static tests.
nmalevanec Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ public function execute()
$this->_coreRegistry->register('backup_manager', $backupManager);

if ($this->getRequest()->getParam('maintenance_mode')) {
if (!$this->maintenanceMode->set(true)) {
$this->maintenanceMode->set(true);

if (!$this->maintenanceMode->isOn()) {
$response->setError(
__(
'You need more permissions to activate maintenance mode right now.'
Expand Down
10 changes: 8 additions & 2 deletions app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
*/
namespace Magento\Backup\Controller\Adminhtml\Index;

use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem;

/**
* Backup rollback controller.
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
class Rollback extends \Magento\Backup\Controller\Adminhtml\Index implements HttpPostActionInterface
{
/**
* Rollback Action
Expand Down Expand Up @@ -82,7 +85,9 @@ public function execute()
}

if ($this->getRequest()->getParam('maintenance_mode')) {
if (!$this->maintenanceMode->set(true)) {
$this->maintenanceMode->set(true);

if (!$this->maintenanceMode->isOn()) {
$response->setError(
__(
'You need more permissions to activate maintenance mode right now.'
Expand Down Expand Up @@ -122,6 +127,7 @@ public function execute()
$adminSession->destroy();

$response->setRedirectUrl($this->getUrl('*'));
// phpcs:disable Magento2.Exceptions.ThrowCatch
} catch (\Magento\Framework\Backup\Exception\CantLoadSnapshot $e) {
$errorMsg = __('We can\'t find the backup file.');
} catch (\Magento\Framework\Backup\Exception\FtpConnectionFailed $e) {
Expand Down