upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

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

Browse source 
[stable27] fix(dav): Catch SAB sync errors during upgrade
This commit is contained in:
Simon L 2023-06-27 14:34:17 +02:00 committed by GitHub
commit 50f1fc0b74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/dav/lib/Migration/Version1027Date20230504122946.php
View file

@ -34,6 +34,7 @@ use OCP\Migration\SimpleMigrationStep;
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 @@ class Version1027Date20230504122946 extends SimpleMigrationStep {
* @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');
}
}
}