use my own logging package

This supports formats that I find more useful; one that mimicks the Google
glog package, and one that is similar but adapted for the systemd journal.

src/cmds/check.rs

@@ -98,7 +98,6 @@ struct File {
 
 pub fn run() -> Result<(), Error> {
     let args: Args = super::parse_args(USAGE)?;
-    super::install_logger(false);
     let (_db_dir, conn) = super::open_conn(&args.flag_db_dir, super::OpenMode::ReadOnly)?;
     let mut files = Vec::new();
     for e in fs::read_dir(&args.flag_sample_file_dir)? {

src/cmds/config/mod.rs

@@ -128,7 +128,6 @@ struct Args {
 
 pub fn run() -> Result<(), Error> {
     let args: Args = super::parse_args(USAGE)?;
-    super::install_logger(false);
     let (_db_dir, conn) = super::open_conn(&args.flag_db_dir, super::OpenMode::ReadWrite)?;
     let db = Arc::new(db::Database::new(conn)?);
     //let dir = Arc::new(dir::Fd::open(&args.flag_sample_file_dir)?);

src/cmds/init.rs

@@ -53,7 +53,6 @@ struct Args {
 
 pub fn run() -> Result<(), Error> {
     let args: Args = super::parse_args(USAGE)?;
-    super::install_logger(false);
     let (_db_dir, mut conn) = super::open_conn(&args.flag_db_dir, super::OpenMode::Create)?;
 
     // Check if the database has already been initialized.

src/cmds/mod.rs

@@ -33,10 +33,6 @@ use docopt;
 use error::Error;
 use libc;
 use rusqlite;
-use slog::{self, DrainExt};
-use slog_envlogger;
-use slog_stdlog;
-use slog_term;
 use std::path::Path;
 
 mod check;
@@ -69,16 +65,6 @@ impl Command {
     }
 }
 
-/// Initializes logging.
-/// `async` should be true only for serving; otherwise logging can block useful work.
-/// Sync logging should be preferred for other modes because async apparently is never flushed
-/// before the program exits, and partial output from these tools is very confusing.
-fn install_logger(async: bool) {
-    let drain = slog_term::StreamerBuilder::new().stderr();
-    let drain = slog_envlogger::new(if async { drain.async() } else { drain }.full().build());
-    slog_stdlog::set_logger(slog::Logger::root(drain.ignore_err(), None)).unwrap();
-}
-
 #[derive(PartialEq, Eq)]
 enum OpenMode {
     ReadOnly,

src/cmds/run.rs

@@ -77,8 +77,6 @@ fn setup_shutdown_future(h: &reactor::Handle) -> BoxFuture<(), ()> {
 
 pub fn run() -> Result<(), Error> {
     let args: Args = super::parse_args(USAGE)?;
-
-    super::install_logger(true);
     let (_db_dir, conn) = super::open_conn(
         &args.flag_db_dir,
         if args.flag_read_only { super::OpenMode::ReadOnly } else { super::OpenMode::ReadWrite })?;
@@ -137,5 +135,5 @@ pub fn run() -> Result<(), Error> {
     }
 
     info!("Exiting.");
-    ::std::process::exit(0);
+    Ok(())
 }

src/cmds/ts.rs

@@ -43,7 +43,6 @@ struct Args {
 
 pub fn run() -> Result<(), Error> {
     let arg: Args = super::parse_args(&USAGE)?;
-    super::install_logger(false);
     for timestamp in &arg.arg_ts {
         let t = recording::Time::parse(timestamp)?;
         println!("{} == {}", t, t.0);

src/cmds/upgrade/mod.rs

@@ -86,7 +86,6 @@ fn set_journal_mode(conn: &rusqlite::Connection, requested: &str) -> Result<(),
 
 pub fn run() -> Result<(), Error> {
     let args: Args = super::parse_args(USAGE)?;
-    super::install_logger(false);
     let (_db_dir, mut conn) = super::open_conn(&args.flag_db_dir, super::OpenMode::ReadWrite)?;
 
     {