Log the error instead of returning it when deletion fails

This commit is contained in:
many 2021-10-07 17:36:54 +02:00
parent 0774b1efa5
commit a92a0c3ed3
No known key found for this signature in database
GPG Key ID: 2CEF23B75189EACA

View File

@ -6,6 +6,7 @@ use std::path::Path;
use error::{IndexResolverError, Result}; use error::{IndexResolverError, Result};
use index_store::{IndexStore, MapIndexStore}; use index_store::{IndexStore, MapIndexStore};
use log::error;
use uuid::Uuid; use uuid::Uuid;
use uuid_store::{HeedUuidStore, UuidStore}; use uuid_store::{HeedUuidStore, UuidStore};
@ -100,8 +101,12 @@ where
let index = self.index_store.create(uuid, primary_key).await?; let index = self.index_store.create(uuid, primary_key).await?;
match self.index_uuid_store.insert(uid, uuid).await { match self.index_uuid_store.insert(uid, uuid).await {
Err(e) => { Err(e) => {
if let Some(index) = self.index_store.delete(uuid).await? { match self.index_store.delete(uuid).await {
index.inner().clone().prepare_for_closing(); Ok(Some(index)) => {
index.inner().clone().prepare_for_closing();
}
Ok(None) => (),
Err(e) => error!("Error while deleting index: {:?}", e),
} }
Err(e) Err(e)
} }
@ -128,8 +133,12 @@ where
pub async fn delete_index(&self, uid: String) -> Result<Uuid> { pub async fn delete_index(&self, uid: String) -> Result<Uuid> {
match self.index_uuid_store.delete(uid.clone()).await? { match self.index_uuid_store.delete(uid.clone()).await? {
Some(uuid) => { Some(uuid) => {
if let Some(index) = self.index_store.delete(uuid).await? { match self.index_store.delete(uuid).await {
index.inner().clone().prepare_for_closing(); Ok(Some(index)) => {
index.inner().clone().prepare_for_closing();
}
Ok(None) => (),
Err(e) => error!("Error while deleting index: {:?}", e),
} }
Ok(uuid) Ok(uuid)
} }