Skip to content
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

fix top level error wrap #55

Merged
merged 1 commit into from
Aug 5, 2024
Merged

fix top level error wrap #55

Show file tree
Hide file tree
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
6 changes: 1 addition & 5 deletions bin/commit_boost.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,5 @@ async fn main() -> eyre::Result<()> {

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

if let Err(err) = args.run().await {
eprintln!("Error: {err}");
std::process::exit(1)
};
Ok(())
args.run().await
}
3 changes: 1 addition & 2 deletions bin/default_pbs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ async fn main() -> Result<()> {
let state = PbsState::<()>::new(pbs_config);

PbsService::init_metrics()?;
PbsService::run::<(), DefaultBuilderApi>(state).await;
Ok(())
PbsService::run::<(), DefaultBuilderApi>(state).await
}
10 changes: 4 additions & 6 deletions crates/pbs/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::net::SocketAddr;

use cb_metrics::provider::MetricsProvider;
use eyre::Result;
use eyre::{Context, Result};
use prometheus::core::Collector;
use tokio::net::TcpListener;
use tracing::{error, info};
use tracing::info;

use crate::{
api::BuilderApi,
Expand All @@ -18,7 +18,7 @@ pub struct PbsService;
// TODO: add ServerMaxHeaderBytes

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

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

if let Err(err) = axum::serve(listener, app).await {
error!(?err, "Pbs server exited")
}
axum::serve(listener, app).await.wrap_err("PBS server exited")
}

pub fn register_metric(c: Box<dyn Collector>) {
Expand Down
Loading