Skip to content

BUGFIX: Prevent unhandled exceptions during auto rebase and allow to open backend #4180

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

Open
mhsdesign wants to merge 1 commit into
base: 9.0
Choose a base branch
from
Open

BUGFIX: Prevent unhandled exceptions during auto rebase and allow to open backend #4180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion Classes/Controller/BackendController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
*/

use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
use Neos\ContentRepository\Core\Feature\WorkspaceCommandSkipped;
use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed;
use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceStatus;
use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
use Neos\EventStore\Exception\ConcurrencyException;
use Neos\Flow\Annotations as Flow;
use Neos\Flow\Log\Utility\LogEnvironment;
use Neos\Flow\Mvc\Controller\ActionController;
use Neos\Flow\Persistence\PersistenceManagerInterface;
use Neos\Neos\Domain\Repository\DomainRepository;
Expand Down Expand Up @@ -167,9 +170,11 @@ public function indexAction(?string $node = null)
) {
try {
$this->workspacePublishingService->rebaseWorkspace($siteDetectionResult->contentRepositoryId, $workspace->workspaceName);
} catch (WorkspaceRebaseFailed) {
} catch (WorkspaceRebaseFailed|WorkspaceCommandSkipped|ConcurrencyException $e) {
// currently we don't have a way to provide this rebase error directly to the neos ui and have it solved.
// as well for a concurrency race condition
// instead we ignore it and have the editor trigger it again via the sync button.
$this->logger->warning(sprintf('Skipped automatic rebase of workspace %s. Got %s (%s)', $workspace->workspaceName->value, $e::class, $e->getMessage()), LogEnvironment::fromMethodName(__METHOD__));
}
}

Expand Down
Loading