File tree Expand file tree Collapse file tree 3 files changed +6
-13
lines changed Expand file tree Collapse file tree 3 files changed +6
-13
lines changed Original file line number Diff line number Diff line change @@ -11,9 +11,5 @@ async fn main() -> eyre::Result<()> {
11
11
12
12
let args = cb_cli:: Args :: parse ( ) ;
13
13
14
- if let Err ( err) = args. run ( ) . await {
15
- eprintln ! ( "Error: {err}" ) ;
16
- std:: process:: exit ( 1 )
17
- } ;
18
- Ok ( ( ) )
14
+ args. run ( ) . await
19
15
}
Original file line number Diff line number Diff line change @@ -18,6 +18,5 @@ async fn main() -> Result<()> {
18
18
let _guard = initialize_tracing_log ( PBS_MODULE_NAME ) ;
19
19
let state = PbsState :: < ( ) > :: new ( pbs_config) ;
20
20
PbsService :: init_metrics ( ) ?;
21
- PbsService :: run :: < ( ) , DefaultBuilderApi > ( state) . await ;
22
- Ok ( ( ) )
21
+ PbsService :: run :: < ( ) , DefaultBuilderApi > ( state) . await
23
22
}
Original file line number Diff line number Diff line change 1
1
use std:: net:: SocketAddr ;
2
2
3
3
use cb_metrics:: provider:: MetricsProvider ;
4
- use eyre:: Result ;
4
+ use eyre:: { Context , Result } ;
5
5
use prometheus:: core:: Collector ;
6
6
use tokio:: net:: TcpListener ;
7
- use tracing:: { error , info} ;
7
+ use tracing:: info;
8
8
9
9
use crate :: {
10
10
api:: BuilderApi ,
@@ -18,7 +18,7 @@ pub struct PbsService;
18
18
// TODO: add ServerMaxHeaderBytes
19
19
20
20
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 < ( ) > {
22
22
// if state.pbs_config().relay_check {
23
23
// PbsService::relay_check(state.relays()).await;
24
24
// }
@@ -32,9 +32,7 @@ impl PbsService {
32
32
33
33
let listener = TcpListener :: bind ( address) . await . expect ( "failed tcp binding" ) ;
34
34
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" )
38
36
}
39
37
40
38
pub fn register_metric ( c : Box < dyn Collector > ) {
You can’t perform that action at this time.
0 commit comments