Skip to content

fix(conductor): don't panic during panic #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperFluffy merged 1 commit into from
Jul 9, 2024
Merged

fix(conductor): don't panic during panic #1252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions crates/astria-conductor/tests/blackbox/helpers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ mod mock_grpc;
use astria_eyre;
pub use mock_grpc::MockGrpc;
use serde_json::json;
use tracing::debug;

pub const CELESTIA_BEARER_TOKEN: &str = "ABCDEFGH";

Expand Down Expand Up @@ -113,10 +114,22 @@ pub struct TestConductor {
impl Drop for TestConductor {
fn drop(&mut self) {
futures::executor::block_on(async {
tokio::time::timeout(Duration::from_secs(2), self.conductor.shutdown())
.await
.expect("timed out waiting for conductor to shut down")
.expect("conductor shut down with an error");
let err_msg =
match tokio::time::timeout(Duration::from_secs(2), self.conductor.shutdown()).await
{
Ok(Ok(())) => None,
Ok(Err(conductor_err)) => Some(format!(
"conductor shut down with an error:\n{conductor_err:?}"
)),
Err(_timeout) => Some("timed out waiting for conductor to shut down".into()),
};
if let Some(err_msg) = err_msg {
if std::thread::panicking() {
debug!("{err_msg}");
} else {
panic!("{err_msg}");
}
}
});
}
}
Expand Down