Merge pull request #42263 from nextcloud/backport/42198/stable28

[stable28] Wrap metadata generation in try/catch
nextcloud · Dec 14, 2023 · 056401b · 056401b
2 parents 892c0bf + 78de15a
commit 056401b
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/core/BackgroundJobs/GenerateMetadataJob.php b/core/BackgroundJobs/GenerateMetadataJob.php
@@ -33,6 +33,7 @@
 use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IConfig;
 use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
 
 class GenerateMetadataJob extends TimedJob {
 	public function __construct(
@@ -42,6 +43,7 @@ public function __construct(
 		private IUserManager $userManager,
 		private IFilesMetadataManager $filesMetadataManager,
 		private IJobList $jobList,
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($time);
 
@@ -102,10 +104,14 @@ private function scanFolder(Folder $folder): void {
 				continue;
 			}
 
-			$this->filesMetadataManager->refreshMetadata(
-				$node,
-				IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND
-			);
+			try {
+				$this->filesMetadataManager->refreshMetadata(
+					$node,
+					IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND
+				);
+			} catch (\Throwable $ex) {
+				$this->logger->warning("Error while generating metadata for fileid ".$node->getId(), ['exception' => $ex]);
+			}
 		}
 	}
 }