Turn off debug logs by default

This commit is contained in:
Roey Darwish Dror 2018-11-21 22:17:31 +02:00
parent 416c829d2f
commit dd00ff091b

View File

@ -41,7 +41,16 @@ SystemMaxUse=16M
#[derive(StructOpt)] #[derive(StructOpt)]
#[structopt(name = "alma", about = "Arch Linux Mobile Appliance")] #[structopt(name = "alma", about = "Arch Linux Mobile Appliance")]
enum App { struct App {
#[structopt(short = "v", long = "verbose", help = "Verbose output")]
verbose: bool,
#[structopt(subcommand)]
cmd: Command,
}
#[derive(StructOpt)]
enum Command {
#[structopt(name = "create", about = "Create a new Arch Linux USB")] #[structopt(name = "create", about = "Create a new Arch Linux USB")]
Create(CreateCommand), Create(CreateCommand),
@ -247,9 +256,12 @@ extern "C" fn handle_sigint(_: i32) {
fn main() { fn main() {
let app = App::from_args(); let app = App::from_args();
CombinedLogger::init(vec![ let log_level = if app.verbose {
TermLogger::new(LevelFilter::Debug, Config::default()).unwrap(), LevelFilter::Debug
]).unwrap(); } else {
LevelFilter::Info
};
CombinedLogger::init(vec![TermLogger::new(log_level, Config::default()).unwrap()]).unwrap();
let sig_action = signal::SigAction::new( let sig_action = signal::SigAction::new(
signal::SigHandler::Handler(handle_sigint), signal::SigHandler::Handler(handle_sigint),
@ -262,9 +274,9 @@ fn main() {
signal::sigaction(signal::SIGQUIT, &sig_action).unwrap(); signal::sigaction(signal::SIGQUIT, &sig_action).unwrap();
} }
let result = match app { let result = match app.cmd {
App::Create(command) => create(command), Command::Create(command) => create(command),
App::Chroot(command) => chroot(command), Command::Chroot(command) => chroot(command),
}; };
match result { match result {