Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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