Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperFluffy committed Feb 3, 2025
1 parent 14dca68 commit 6a69de9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions crates/astria-conductor/src/executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ impl Executor {
}
}

pub(crate) struct Initialized {
struct Initialized {
config: crate::Config,

/// The execution client driving the rollup.
Expand Down Expand Up @@ -582,14 +582,14 @@ impl Initialized {
)
}

#[instrument(skip_all, err, ret)]
#[instrument(skip_all, err)]
async fn shutdown(mut self, reason: eyre::Result<&'static str>) -> eyre::Result<()> {
info!("signaling all reader tasks to exit");
self.reader_cancellation_token.cancel();
while let Some((task, exit_status)) = self.reader_tasks.join_next().await {
match crate::utils::flatten(exit_status) {
Ok(()) => info!(task, "task exited"),
Err(error) => warn!(task, %error, "task exited"),
Err(error) => warn!(task, %error, "task exited with error"),
}
}
report_exit(reason, "shutting down")
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/sequencer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub(crate) struct Reader {

impl Reader {
pub(crate) async fn run_until_stopped(mut self) -> eyre::Result<()> {
let () = select!(
select!(
() = self.shutdown.clone().cancelled_owned() => {
return report_exit(Ok("received shutdown signal while waiting for Sequencer reader task to initialize"), "");
}
Expand Down

0 comments on commit 6a69de9

Please sign in to comment.