diff options
| author | Fuwn <[email protected]> | 2021-05-17 13:04:48 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2021-05-17 13:04:48 -0700 |
| commit | ca291ab60344036c03b4f754b9666cd8d20aa7ff (patch) | |
| tree | b581c860459b200589d18d801a1a0425c4dbe869 | |
| parent | feat(core): better panic messages on release builds (diff) | |
| download | whirl-ca291ab60344036c03b4f754b9666cd8d20aa7ff.tar.xz whirl-ca291ab60344036c03b4f754b9666cd8d20aa7ff.zip | |
feat(cli/clean): warn instead of bail when cleaning
Log message now also differs depending on if the subject is a file or directory.
| -rw-r--r-- | whirl/Cargo.toml | 2 | ||||
| -rw-r--r-- | whirl/src/cli.rs | 8 | ||||
| -rw-r--r-- | whirl/src/lib.rs | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/whirl/Cargo.toml b/whirl/Cargo.toml index d86e310..537e958 100644 --- a/whirl/Cargo.toml +++ b/whirl/Cargo.toml @@ -23,12 +23,12 @@ dotenv = "0.15.0" log = "0.4.14" flexi_logger = "0.17.1" human-panic = "1.0.3" +# simple-error = "0.2.3" # Utility rand = "0.8.3" async-trait = "0.1.50" sysinfo = "0.17.5" -simple-error = "0.2.3" # Byte Manipulation bytes = "1.0.1" diff --git a/whirl/src/cli.rs b/whirl/src/cli.rs index 6565845..4fa4fdd 100644 --- a/whirl/src/cli.rs +++ b/whirl/src/cli.rs @@ -47,9 +47,13 @@ impl Cli { } else if matches.is_present("clean") { let cleanable_directories = vec!["./log/"]; for dir in cleanable_directories { - println!("cleaning directory '{}'", dir); + let mut file_type = "directory"; + if !dir.ends_with('/') { + file_type = "file"; + } + println!("cleaning {}: {}", file_type, dir); if let Err(e) = std::fs::remove_dir_all(dir) { - bail!("error delete directory '{}': {}", dir, e); + warn!("cannot delete {}: {}: {}", file_type, dir, e); } } } diff --git a/whirl/src/lib.rs b/whirl/src/lib.rs index 5392a23..7b45e18 100644 --- a/whirl/src/lib.rs +++ b/whirl/src/lib.rs @@ -17,8 +17,8 @@ extern crate log; extern crate diesel; #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate simple_error; +// #[macro_use] +// extern crate simple_error; pub mod cli; pub mod subs; |