diff options
| -rw-r--r-- | dpibreak.1 | 2 | ||||
| -rw-r--r-- | dpibreak.1.md | 2 | ||||
| -rw-r--r-- | src/opt.rs | 16 |
3 files changed, 15 insertions, 5 deletions
@@ -100,7 +100,7 @@ used for IPv4 and IPv6. (default: 1) .Linux only. Custom nftables command to be executed. (default: nft) .TP -.B \-\-loglevel \fIdebug|info|warning|error\fR +.B \-\-log\-level \fIdebug|info|warning|error\fR Set the logging level (default: .BR warning ). Aliases: diff --git a/dpibreak.1.md b/dpibreak.1.md index a11475b..adb939f 100644 --- a/dpibreak.1.md +++ b/dpibreak.1.md @@ -71,7 +71,7 @@ IPv6. (default: 1) Custom nftables command to be executed. (default: nft) -**--loglevel *debug\|info\|warning\|error*** +**--log-level *debug\|info\|warning\|error*** Set the logging level (default: **warning**). Aliases: **warn** -\> **warning**, **err** -\> **error**. @@ -79,7 +79,7 @@ where .next() .ok_or_else(|| anyhow!("argument: missing value after {}", arg_name))?; raw.parse::<T>() - .with_context(|| format!("argument {}: invalid value '{}'", arg_name, raw)) + .with_context(|| format!("argument: {}: invalid value '{}'", arg_name, raw)) } fn usage() { @@ -91,7 +91,7 @@ fn usage() { #[cfg(target_os = "linux")] println!(" --nft-command <string> (default: {DEFAULT_NFT_COMMAND})"); - println!(" --loglevel <debug|info|warning|error> (default: {DEFAULT_LOG_LEVEL})"); + println!(" --log-level <debug|info|warning|error> (default: {DEFAULT_LOG_LEVEL})"); println!(" --no-splash Do not print splash messages\n"); println!(" --fake Enable fake clienthello injection"); @@ -129,13 +129,23 @@ fn parse_args_1() -> Result<()> { let mut args = std::env::args().skip(1); // program name + let mut warned_loglevel_deprecated = false; + while let Some(arg) = args.next() { let argv = arg.as_str(); match argv { "-h" | "--help" => { usage(); std::process::exit(0); } "--delay-ms" => { delay_ms = take_value(&mut args, argv)?; } - "--loglevel" => { log_level = take_value(&mut args, argv)?; } + "--log-level" | "--loglevel" => { + if argv == "--loglevel" && !warned_loglevel_deprecated { + // FIXME(on release): remove this on v1.0.0 + warned_loglevel_deprecated = true; + eprintln!("Note: `{arg}' has been deprecated since v0.1.1. \ +Use `--log-level' instead."); + } + log_level = take_value(&mut args, argv)?; + } "--no-splash" => { no_splash = true; } "--fake" => { fake = true; } |