Skip to content

Commit f5778a4

Browse files
committed
Complete adjustments as recommended.
1 parent eb084fe commit f5778a4

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/main.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ fn main() -> BoxResult<()> {
4444
})?;
4545

4646
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+
}
4851
exiting.join().expect("unable to join SIGINT handler thread");
4952
} else if args.client.is_some() {
5053
log::debug!("registering SIGINT handler...");
@@ -59,11 +62,15 @@ fn main() -> BoxResult<()> {
5962
})?;
6063

6164
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+
}
6369
} else {
6470
use clap::CommandFactory;
6571
let mut cmd = args::Args::command();
6672
cmd.print_help().unwrap();
73+
std::process::exit(2);
6774
}
6875
Ok(())
6976
}

src/server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,10 @@ pub fn serve(args: &Args) -> BoxResult<()> {
346346
while is_alive() {
347347
if let Err(err) = poll.poll(&mut events, Some(POLL_TIMEOUT)) {
348348
if err.kind() == std::io::ErrorKind::Interrupted {
349-
log::debug!("Poll interrupted: \"{err}\"");
349+
log::debug!("poll interrupted, \"{err}\" ignored; resuming poll");
350350
continue;
351351
}
352-
log::error!("Poll error: {}", err);
352+
log::error!("poll error: {}", err);
353353
break;
354354
}
355355
for event in events.iter() {

0 commit comments

Comments
 (0)