Fix race condition in error collection; add another warning for dropp…

…ed errors
Finomnis · Oct 13, 2023 · 8836224 · 8836224
1 parent 4baaf7f
commit 8836224
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/subsystem/error_collector.rs b/src/subsystem/error_collector.rs
@@ -18,6 +18,7 @@ impl<ErrType: ErrTypeTraits> ErrorCollector<ErrType> {
         match self {
             ErrorCollector::Collecting(receiver) => {
                 let mut errors = vec![];
+                receiver.close();
                 while let Ok(e) = receiver.try_recv() {
                     errors.push(e);
                 }
@@ -29,3 +30,14 @@ impl<ErrType: ErrTypeTraits> ErrorCollector<ErrType> {
         }
     }
 }
+
+impl<ErrType: ErrTypeTraits> Drop for ErrorCollector<ErrType> {
+    fn drop(&mut self) {
+        if let Self::Collecting(receiver) = self {
+            receiver.close();
+            while let Ok(e) = receiver.try_recv() {
+                tracing::warn!("An error got dropped: {e:?}");
+            }
+        }
+    }
+}
diff --git a/src/toplevel.rs b/src/toplevel.rs
@@ -152,6 +152,7 @@ impl<ErrType: ErrTypeTraits> Toplevel<ErrType> {
     ) -> Result<(), GracefulShutdownError<ErrType>> {
         let collect_errors = move || {
             let mut errors = vec![];
+            self.errors.close();
             while let Ok(e) = self.errors.try_recv() {
                 errors.push(e);
             }