From da47355b807300538f772325f45a31a7f1cf8817 Mon Sep 17 00:00:00 2001
From: Francois Suter <francois@typo3.org>
Date: Tue, 24 Feb 2015 10:05:43 +0100
Subject: [PATCH] [BUGFIX] Let Scheduler handle storage indexing exception
The FileStorageIndexingTask should not handle exceptions itself.
Instead it should let them bubble up to let the Scheduler take
care of the reporting.
Resolves: #65248
Releases: 6.2, master
Change-Id: Ib29c20b40de8abd27869682c9f6d4479718d25f5
Reviewed-on: http://review.typo3.org/37156
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Classes/Task/FileStorageIndexingTask.php | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
index 9ebb4cc52dc1..9082b21ae127 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
@@ -32,20 +32,14 @@ class FileStorageIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* @return bool TRUE on successful execution, FALSE on error
*/
public function execute() {
- $success = FALSE;
if ((int)$this->storageUid > 0) {
$storage = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->getStorageObject($this->storageUid);
$storage->setEvaluatePermissions(FALSE);
$indexer = $this->getIndexer($storage);
- try {
- $indexer->processChangesInStorages();
- $success = TRUE;
- } catch (\Exception $e) {
- $success = FALSE;
- }
+ $indexer->processChangesInStorages();
$storage->setEvaluatePermissions(TRUE);
}
- return $success;
+ return TRUE;
}
/**
@@ -58,5 +52,4 @@ class FileStorageIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Index\Indexer::class, $storage);
}
-
}
--
GitLab