From 9f2d06b1bb93dac3b818b15456bd21db5f4db0dd Mon Sep 17 00:00:00 2001 From: Johannes Heuel Date: Tue, 20 Sep 2022 21:53:54 +0200 Subject: [PATCH] improve error message --- zoidberg_client/src/main.rs | 6 ++++-- zoidberg_server/src/main.rs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/zoidberg_client/src/main.rs b/zoidberg_client/src/main.rs index f437b4d..1461457 100644 --- a/zoidberg_client/src/main.rs +++ b/zoidberg_client/src/main.rs @@ -129,8 +129,10 @@ async fn main() -> Result<(), Box> { ) .get_matches(); let server = matches.value_of("server").unwrap(); - let secret = std::env::var("ZOIDBERG_SECRET") - .expect("Please set the $ZOIDBERG_SECRET environment variable"); + let secret = std::env::var("ZOIDBERG_SECRET").unwrap_or_else(|_| { + println!("Please set the $ZOIDBERG_SECRET environment variable"); + std::process::exit(1); + }); let client = Worker::new(server, &secret) .await diff --git a/zoidberg_server/src/main.rs b/zoidberg_server/src/main.rs index c5b5caa..e1e271a 100644 --- a/zoidberg_server/src/main.rs +++ b/zoidberg_server/src/main.rs @@ -162,8 +162,10 @@ async fn submit( async fn main() -> std::io::Result<()> { env_logger::Builder::from_env(Env::default().default_filter_or("zoidberg_server=info")).init(); - let secret = std::env::var("ZOIDBERG_SECRET") - .expect("Please set the $ZOIDBERG_SECRET environment variable"); + let secret = std::env::var("ZOIDBERG_SECRET").unwrap_or_else(|_| { + println!("Please set the $ZOIDBERG_SECRET environment variable"); + std::process::exit(1); + }); let _matches = clap::App::new("Zoidberg server") .version(VERSION)