tangent128/webmetro
1
0
Fork 0
Code Issues 1 Pull requests Releases Packages Wiki Activity

Be less "clever" in main.rs, don't twist everything into the runtime.

Browse source
This commit is contained in:
Tangent 128 2018-10-20 22:06:42 -04:00
parent fe50663938
commit 713a7d4741
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main.rs
View file

@ -35,28 +35,26 @@ fn options() -> App<'static, 'static> {
fn main() { fn main() {
let args = options().get_matches(); let args = options().get_matches();
tokio_run(match args.subcommand() { match args.subcommand() {
("filter", Some(sub_args)) => box_up(filter::run(sub_args)), ("filter", Some(sub_args)) => { tokio_run(filter::run(sub_args)); },
("relay", Some(sub_args)) => box_up(relay::run(sub_args)), ("relay", Some(sub_args)) => { relay::run(sub_args).unwrap_or_else(handle_error); },
("send", Some(sub_args)) => box_up(send::run(sub_args)), ("send", Some(sub_args)) => { tokio_run(send::run(sub_args)); },
("dump", Some(sub_args)) => box_up(dump::run(sub_args)), ("dump", Some(sub_args)) => { dump::run(sub_args).unwrap_or_else(handle_error); },
_ => box_up(futures::lazy(|| { _ => {
options().print_help().unwrap(); options().print_help().unwrap();
println!(""); println!("");
Ok(()) }
})) };
});
} }
fn tokio_run(task: Box<Future<Item=(), Error=WebmetroError> + Send>) { fn handle_error(err: WebmetroError) {
rt::run(task.into_future().map_err(|err| {
eprintln!("Error: {}", err); eprintln!("Error: {}", err);
}
fn tokio_run<T: IntoFuture<Item=(), Error=WebmetroError> + Send>(task: T)
where T::Future: Send + 'static {
rt::run(task.into_future().map_err(|err| {
handle_error(err);
::std::process::exit(1); ::std::process::exit(1);
})); }));
} }
fn box_up<F: IntoFuture<Item=(), Error=WebmetroError>>(task: F) -> Box<Future<Item=(), Error=WebmetroError> + Send>
where F::Future: Send + 'static
{
Box::new(task.into_future())
}