Merge branch 'main' into alerts-updates

Signed-off-by: parmesant <[email protected]>

Author: parmesant

src/catalog/mod.rs

@@ -366,8 +366,8 @@ pub async fn get_first_event(
         Mode::All | Mode::Ingest => {
             // get current snapshot
             let stream_first_event = PARSEABLE.get_stream(stream_name)?.get_first_event();
-            if let Some(event) = stream_first_event {
-                first_event_at = event;
+            if let Some(first_event) = stream_first_event {
+                first_event_at = first_event;
             } else {
                 let mut meta = storage.get_object_store_format(stream_name).await?;
                 let meta_clone = meta.clone();

src/livetail.rs

@@ -161,7 +161,8 @@ impl Stream for ReceiverPipe {
 impl Drop for ReceiverPipe {
     fn drop(&mut self) {
         if let Some(map) = self._ref.upgrade()
-            && let Some(pipes) = map.write().unwrap().get_mut(&self.stream)
+            && let Ok(mut guard) = map.write()
+            && let Some(pipes) = guard.get_mut(&self.stream)
         {
             pipes.retain(|x| x.id != self.id)
         }