Skip to content

Commit

Permalink
logging is disabled by default, add option to enable it
Browse files Browse the repository at this point in the history
Signed-off-by: Vladimir Markelov <vmatroskin@gmail.com>
  • Loading branch information
VladimirMarkelov committed Dec 22, 2020
1 parent d3bb6c9 commit 11cdd7a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solkit"
version = "0.4.4"
version = "0.4.5"
authors = ["Vladimir Markelov <vmatroskin@gmail.com>"]
edition = "2018"

Expand Down
7 changes: 7 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
solkit (0.4.5) unstable; urgency=medium

* Logging is disabled by default
* Added command-line option `--log` to enable logging

-- Vladimir Markelov <vmatroskin@gmail.com> Tue, 22 Dec 2020 13:14:31 -0800

solkit (0.4.4) unstable; urgency=medium

* Added documetation
Expand Down
6 changes: 4 additions & 2 deletions src/bin/solkit/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,10 @@ fn main_loop(cli: &opts::CliOpts) -> Result<()> {
fn main() -> Result<()> {
let cli = opts::parse_args();

let cb = ConfigBuilder::new().set_time_format("[%Y-%m-%d %H:%M:%S%.3f]".to_string()).build();
CombinedLogger::init(vec![WriteLogger::new(LevelFilter::Info, cb, File::create("app.log").unwrap())]).unwrap();
if cli.logging {
let cb = ConfigBuilder::new().set_time_format("[%Y-%m-%d %H:%M:%S%.3f]".to_string()).build();
CombinedLogger::init(vec![WriteLogger::new(LevelFilter::Info, cb, File::create("app.log").unwrap())]).unwrap();
}
// info!("started");

let mut stdout = stdout();
Expand Down
5 changes: 4 additions & 1 deletion src/bin/solkit/opts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const APP_NAME: &str = "Solitaire Kit";
pub(crate) struct CliOpts {
pub(crate) dark: bool,
pub(crate) filename: String,
pub(crate) logging: bool,
}

fn print_usage(program: &str, opts: &Options) {
Expand All @@ -18,12 +19,13 @@ fn print_usage(program: &str, opts: &Options) {
pub(crate) fn parse_args() -> CliOpts {
let args: Vec<String> = env::args().collect();
let program = args[0].clone();
let mut cli = CliOpts { dark: true, filename: String::new() };
let mut cli = CliOpts { dark: true, filename: String::new(), logging: false };

let mut opts = Options::new();
opts.optflag("h", "help", "Show this help");
opts.optopt("t", "theme", "Choose UI theme", "dark | classic");
opts.optflag("v", "version", "Show application version");
opts.optflag("", "log", "Enable logging");

let matches: Matches = match opts.parse(&args[1..]) {
Ok(m) => m,
Expand All @@ -44,6 +46,7 @@ pub(crate) fn parse_args() -> CliOpts {
print_usage(&program, &opts);
exit(0);
}
cli.logging = matches.opt_present("log");

if let Some(val) = matches.opt_str("t") {
cli.dark = match val.to_lowercase().as_str() {
Expand Down

0 comments on commit 11cdd7a

Please sign in to comment.