Skip to content

Commit 7649c89

Browse files
authored
fix top level error wrap (Commit-Boost#55)
1 parent 550bed5 commit 7649c89

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

bin/commit_boost.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,5 @@ async fn main() -> eyre::Result<()> {
1111

1212
let args = cb_cli::Args::parse();
1313

14-
if let Err(err) = args.run().await {
15-
eprintln!("Error: {err}");
16-
std::process::exit(1)
17-
};
18-
Ok(())
14+
args.run().await
1915
}

bin/default_pbs.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ async fn main() -> Result<()> {
1818
let _guard = initialize_tracing_log(PBS_MODULE_NAME);
1919
let state = PbsState::<()>::new(pbs_config);
2020
PbsService::init_metrics()?;
21-
PbsService::run::<(), DefaultBuilderApi>(state).await;
22-
Ok(())
21+
PbsService::run::<(), DefaultBuilderApi>(state).await
2322
}

crates/pbs/src/service.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::net::SocketAddr;
22

33
use cb_metrics::provider::MetricsProvider;
4-
use eyre::Result;
4+
use eyre::{Context, Result};
55
use prometheus::core::Collector;
66
use tokio::net::TcpListener;
7-
use tracing::{error, info};
7+
use tracing::info;
88

99
use crate::{
1010
api::BuilderApi,
@@ -18,7 +18,7 @@ pub struct PbsService;
1818
// TODO: add ServerMaxHeaderBytes
1919

2020
impl PbsService {
21-
pub async fn run<S: BuilderApiState, T: BuilderApi<S>>(state: PbsState<S>) {
21+
pub async fn run<S: BuilderApiState, T: BuilderApi<S>>(state: PbsState<S>) -> Result<()> {
2222
// if state.pbs_config().relay_check {
2323
// PbsService::relay_check(state.relays()).await;
2424
// }
@@ -32,9 +32,7 @@ impl PbsService {
3232

3333
let listener = TcpListener::bind(address).await.expect("failed tcp binding");
3434

35-
if let Err(err) = axum::serve(listener, app).await {
36-
error!(?err, "Pbs server exited")
37-
}
35+
axum::serve(listener, app).await.wrap_err("PBS server exited")
3836
}
3937

4038
pub fn register_metric(c: Box<dyn Collector>) {

0 commit comments

Comments
 (0)