File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -44,7 +44,10 @@ fn main() -> BoxResult<()> {
44
44
} ) ?;
45
45
46
46
log:: debug!( "beginning normal operation..." ) ;
47
- server:: serve ( & args) ?;
47
+ if let Err ( err) = server:: serve ( & args) {
48
+ log:: error!( "unable to run server: {}" , err) ;
49
+ std:: process:: exit ( 4 ) ;
50
+ }
48
51
exiting. join ( ) . expect ( "unable to join SIGINT handler thread" ) ;
49
52
} else if args. client . is_some ( ) {
50
53
log:: debug!( "registering SIGINT handler..." ) ;
@@ -59,11 +62,15 @@ fn main() -> BoxResult<()> {
59
62
} ) ?;
60
63
61
64
log:: debug!( "connecting to server..." ) ;
62
- client:: execute ( & args) ?;
65
+ if let Err ( err) = client:: execute ( & args) {
66
+ log:: error!( "unable to run client: {}" , err) ;
67
+ std:: process:: exit ( 4 ) ;
68
+ }
63
69
} else {
64
70
use clap:: CommandFactory ;
65
71
let mut cmd = args:: Args :: command ( ) ;
66
72
cmd. print_help ( ) . unwrap ( ) ;
73
+ std:: process:: exit ( 2 ) ;
67
74
}
68
75
Ok ( ( ) )
69
76
}
Original file line number Diff line number Diff line change @@ -346,10 +346,10 @@ pub fn serve(args: &Args) -> BoxResult<()> {
346
346
while is_alive ( ) {
347
347
if let Err ( err) = poll. poll ( & mut events, Some ( POLL_TIMEOUT ) ) {
348
348
if err. kind ( ) == std:: io:: ErrorKind :: Interrupted {
349
- log:: debug!( "Poll interrupted: \" {err}\" " ) ;
349
+ log:: debug!( "poll interrupted, \" {err}\" ignored; resuming poll " ) ;
350
350
continue ;
351
351
}
352
- log:: error!( "Poll error: {}" , err) ;
352
+ log:: error!( "poll error: {}" , err) ;
353
353
break ;
354
354
}
355
355
for event in events. iter ( ) {
You can’t perform that action at this time.
0 commit comments