Merge pull request #39028 from nextcloud/backport/39005/stable27

[stable27] fix(dav): Catch SAB sync errors during upgrade
nextcloud · Jun 27, 2023 · 50f1fc0 · 50f1fc0
2 parents ff04de6 + 0fd478b
commit 50f1fc0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/apps/dav/lib/Migration/Version1027Date20230504122946.php b/apps/dav/lib/Migration/Version1027Date20230504122946.php
@@ -34,6 +34,7 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
 class Version1027Date20230504122946 extends SimpleMigrationStep {
 	private SyncService $syncService;
@@ -49,6 +50,13 @@ public function __construct(SyncService $syncService, LoggerInterface $logger) {
 	 * @param array $options
 	 */
 	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$this->syncService->syncInstance();
+		try {
+			$this->syncService->syncInstance();
+		} catch (Throwable $e) {
+			$this->logger->error('Could not sync system address books during update', [
+				'exception' => $e,
+			]);
+			$output->warning('System address book sync failed. See logs for details');
+		}
 	}
 }