Skip to content

Commit fbc3b52

Browse files
committed
chore: cleanup, simplification
1 parent ffd81aa commit fbc3b52

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/handlers/http/logstream.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ pub async fn delete(stream_name: Path<String>) -> Result<impl Responder, StreamE
8484
// clear filters associated to the deleted logstream
8585
delete_zombie_filters(&stream_name)
8686
.await
87-
.map_err(|err| {
88-
StreamError::Anyhow(anyhow::Error::msg(err.to_string()))
89-
})?;
87+
.map_err(|e| StreamError::Anyhow(anyhow::anyhow!(e)))?;
9088

9189
Ok((format!("log stream {stream_name} deleted"), StatusCode::OK))
9290
}

src/handlers/http/modal/utils/logstream_utils.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ pub async fn delete_zombie_filters(stream_name: &str) -> Result<(), ZombieFilter
117117
stream_name,
118118
err
119119
);
120-
}
121-
122-
if let Some(filter_id) = filter.filter_id.as_ref() {
123-
FILTERS.delete_filter(filter_id).await;
120+
} else { // ok: have the filter removed from memory only when the storage deletion succeeds
121+
if let Some(filter_id) = filter.filter_id.as_ref() {
122+
FILTERS.delete_filter(filter_id).await;
123+
}
124124
}
125125
}
126126

127-
return Ok(());
127+
Ok(())
128128
}

0 commit comments

Comments
 (0)