Skip to content

Commit 79c25f4

Browse files
authored
Merge pull request #42198 from nextcloud/artonge/fix/metadata_error
Wrap metadata generation in try/catch
2 parents 11e27ac + 8eb58d0 commit 79c25f4

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

core/BackgroundJobs/GenerateMetadataJob.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
use OCP\FilesMetadata\IFilesMetadataManager;
3434
use OCP\IConfig;
3535
use OCP\IUserManager;
36+
use Psr\Log\LoggerInterface;
3637

3738
class GenerateMetadataJob extends TimedJob {
3839
public function __construct(
@@ -42,6 +43,7 @@ public function __construct(
4243
private IUserManager $userManager,
4344
private IFilesMetadataManager $filesMetadataManager,
4445
private IJobList $jobList,
46+
private LoggerInterface $logger,
4547
) {
4648
parent::__construct($time);
4749

@@ -102,10 +104,14 @@ private function scanFolder(Folder $folder): void {
102104
continue;
103105
}
104106

105-
$this->filesMetadataManager->refreshMetadata(
106-
$node,
107-
IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND
108-
);
107+
try {
108+
$this->filesMetadataManager->refreshMetadata(
109+
$node,
110+
IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND
111+
);
112+
} catch (\Throwable $ex) {
113+
$this->logger->warning("Error while generating metadata for fileid ".$node->getId(), ['exception' => $ex]);
114+
}
109115
}
110116
}
111117
}

0 commit comments

Comments
 (0)