diff options
author | Anna Larch <anna@nextcloud.com> | 2024-04-26 14:05:38 +0200 |
---|---|---|
committer | Anna Larch <anna@nextcloud.com> | 2024-05-06 17:08:25 +0200 |
commit | e43811d39597680210022e29e2d4faed1ed2edb0 (patch) | |
tree | dd68c0756ee2bbdcb6728baac9ae3b46b24faf74 | |
parent | a54e69cb74322f9ff54c1d54feea359dbb15d182 (diff) | |
download | nextcloud-server-e43811d39597680210022e29e2d4faed1ed2edb0.tar.gz nextcloud-server-e43811d39597680210022e29e2d4faed1ed2edb0.zip |
fix(userstatus): catch unique constrain violation on revert
Signed-off-by: Anna Larch <anna@nextcloud.com>
-rw-r--r-- | apps/dav/lib/CalDAV/Status/StatusService.php | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/Status/StatusService.php b/apps/dav/lib/CalDAV/Status/StatusService.php index 29129a3b073..ed2c233055c 100644 --- a/apps/dav/lib/CalDAV/Status/StatusService.php +++ b/apps/dav/lib/CalDAV/Status/StatusService.php @@ -32,6 +32,7 @@ use OCA\UserStatus\Service\StatusService as UserStatusService; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Calendar\IManager; +use OCP\DB\Exception; use OCP\ICache; use OCP\ICacheFactory; use OCP\IUser as User; @@ -72,7 +73,18 @@ class StatusService { } if(empty($calendarEvents)) { - $this->userStatusService->revertUserStatus($userId, IUserStatus::MESSAGE_CALENDAR_BUSY); + try { + $this->userStatusService->revertUserStatus($userId, IUserStatus::MESSAGE_CALENDAR_BUSY); + } catch (Exception $e) { + if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) { + // A different process might have written another status + // update to the DB while we're processing our stuff. + // We cannot safely restore the status as we don't know which one is valid at this point + // So let's silently log this one and exit + $this->logger->debug('Unique constraint violation for live user status', ['exception' => $e]); + return; + } + } $this->logger->debug('No calendar events found for status check', ['user' => $userId]); return; } @@ -118,7 +130,18 @@ class StatusService { }); if(empty($applicableEvents)) { - $this->userStatusService->revertUserStatus($userId, IUserStatus::MESSAGE_CALENDAR_BUSY); + try { + $this->userStatusService->revertUserStatus($userId, IUserStatus::MESSAGE_CALENDAR_BUSY); + } catch (Exception $e) { + if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) { + // A different process might have written another status + // update to the DB while we're processing our stuff. + // We cannot safely restore the status as we don't know which one is valid at this point + // So let's silently log this one and exit + $this->logger->debug('Unique constraint violation for live user status', ['exception' => $e]); + return; + } + } $this->logger->debug('No status relevant events found, skipping calendar status change', ['user' => $userId]); return; } |