nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve deadlocks (I'm an idiot)

Browse Source
This commit is contained in:
Lennart
2025-01-15 21:02:53 +01:00
parent d03d394e54
commit e6c09074d3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/store_sqlite/src/addressbook_store.rs
View File

@@ -363,6 +363,8 @@ impl AddressbookStore for SqliteAddressbookStore {
.await .await
.map_err(crate::Error::from)?; .map_err(crate::Error::from)?;
tx.commit().await.map_err(crate::Error::from)?;
// TODO: Watch for errors here? // TODO: Watch for errors here?
let _ = self.sender.try_send(CollectionOperation { let _ = self.sender.try_send(CollectionOperation {
r#type: CollectionOperationType::Object, r#type: CollectionOperationType::Object,
@@ -374,7 +376,6 @@ impl AddressbookStore for SqliteAddressbookStore {
sync_token: Some(synctoken), sync_token: Some(synctoken),
}); });
tx.commit().await.map_err(crate::Error::from)?;
Ok(()) Ok(())
} }

4
crates/store_sqlite/src/calendar_store.rs
View File

@@ -308,6 +308,8 @@ impl CalendarStore for SqliteCalendarStore {
) )
.await?; .await?;
tx.commit().await.map_err(crate::Error::from)?;
// TODO: Watch for errors here? // TODO: Watch for errors here?
let _ = self.sender.try_send(CollectionOperation { let _ = self.sender.try_send(CollectionOperation {
r#type: CollectionOperationType::Object, r#type: CollectionOperationType::Object,
@@ -315,8 +317,6 @@ impl CalendarStore for SqliteCalendarStore {
topic: self.get_calendar(&principal, &cal_id).await?.push_topic, topic: self.get_calendar(&principal, &cal_id).await?.push_topic,
sync_token: Some(synctoken), sync_token: Some(synctoken),
}); });
tx.commit().await.map_err(crate::Error::from)?;
Ok(()) Ok(())
} }