aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBen Morrison <ben@gbmor.dev>2020-05-26 22:01:49 -0400
committerBen Morrison <ben@gbmor.dev>2020-05-26 23:54:12 -0400
commit8ecc2943a4241d466a9bf5a359260a958e3d3b46 (patch)
treea80a360c0220aef4f8df98a9900928a0ac84af9a /src
parentf79e97f5c3cae593aefaf7b02664e961572092c8 (diff)
downloadclinte-8ecc2943a4241d466a9bf5a359260a958e3d3b46.tar.gz
cleaner error handling and verbose logging in main()
Diffstat (limited to 'src')
-rw-r--r--src/main.rs58
1 files changed, 47 insertions, 11 deletions
diff --git a/src/main.rs b/src/main.rs
index 53cb2f9..8b6cb9a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,11 +11,10 @@ mod logging;
mod posts;
mod user;
-fn main() -> error::Result<()> {
+fn main() {
let arg_matches = &*conf::ARGS;
let start = time::Instant::now();
- let logfile = format!("/tmp/clinte_{}.log", *user::NAME);
- logging::init(&logfile)?;
+ logging::checked_init();
log::info!("clinte starting up!");
println!("clinte v{}", clap::crate_version!());
@@ -30,26 +29,63 @@ fn main() -> error::Result<()> {
if arg_matches.subcommand_matches("post").is_some() {
log::info!("New post...");
- posts::create(&db)?;
+ if let Err(e) = posts::create(&db) {
+ log::error!("Error creating new post");
+ if *conf::DEBUG {
+ log::error!("--> {}", e);
+ }
+ std::process::exit(1);
+ }
} else if arg_matches.subcommand_matches("update").is_some() {
let id: u32 = if let Some(val) = arg_matches.subcommand_matches("update_handler") {
- val.value_of("id").unwrap().parse()?
+ match val.value_of("id").unwrap_or_else(|| "0").parse() {
+ Ok(n) => n,
+ Err(e) => {
+ log::error!("Couldn't parse ID");
+ if *conf::DEBUG {
+ log::error!("--> {}", e);
+ }
+ std::process::exit(1);
+ }
+ }
} else {
0
};
log::info!("Updating post ...");
- posts::update_handler(&db, id)?;
+ if let Err(e) = posts::update_handler(&db, id) {
+ log::error!("Error updating post {}", id);
+ if *conf::DEBUG {
+ log::error!("--> {}", e);
+ }
+ std::process::exit(1);
+ }
} else if arg_matches.subcommand_matches("delete").is_some() {
let id: u32 = if let Some(val) = arg_matches.subcommand_matches("update_handler") {
- val.value_of("id").unwrap_or_else(|| "0").parse()?
+ match val.value_of("id").unwrap_or_else(|| "0").parse() {
+ Ok(n) => n,
+ Err(_) => {
+ log::error!("Couldn't parse ID");
+ std::process::exit(1);
+ }
+ }
} else {
0
};
log::info!("Deleting post");
- posts::delete_handler(&db, id)?;
+ if let Err(e) = posts::delete_handler(&db, id) {
+ log::error!("Error deleting post {}", id);
+ if *conf::DEBUG {
+ log::error!("--> {}", e);
+ }
+ std::process::exit(1);
+ }
}
- posts::display(&db)?;
-
- Ok(())
+ if let Err(e) = posts::display(&db) {
+ log::error!("Error displaying posts");
+ if *conf::DEBUG {
+ log::error!("--> {}", e);
+ }
+ std::process::exit(1);
+ }
}