From 9415214bc066fcfcf4f127f730b72e0f52ade3df Mon Sep 17 00:00:00 2001
From: Axel Burri <axel@tty0.ch>
Date: Fri, 21 Aug 2020 16:14:17 +0200
Subject: [PATCH] btrbk: reword/fix verbose and loglevel options

---
 btrbk                | 16 ++++++++--------
 doc/btrbk.1.asciidoc |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/btrbk b/btrbk
index ad64ad3..e241c70 100755
--- a/btrbk
+++ b/btrbk
@@ -360,9 +360,9 @@ options:
        --preserve-snapshots  preserve snapshots (do not delete snapshots)
        --preserve-backups    preserve backups (do not delete backups)
        --wipe                delete all but latest snapshots
-   -v, --verbose             be verbose (set loglevel=info)
+   -v, --verbose             be more verbose (increase logging level)
    -q, --quiet               be quiet (do not print backup summary)
-   -l, --loglevel=LEVEL      set logging level (warn, info, debug, trace)
+   -l, --loglevel=LEVEL      set logging level (error, warn, info, debug, trace)
    -t, --table               change output to table format
    -L, --long                change output to long format
        --format=FORMAT       change output format, FORMAT=table|long|raw
@@ -5043,12 +5043,12 @@ MAIN:
 
   # assign command line options
   @config_src = ( $config_cmdline ) if($config_cmdline);
-  if   (lc($loglevel) eq "warn")  { $loglevel = 1; }
-  elsif(lc($loglevel) eq "info")  { $loglevel = 2; }
-  elsif(lc($loglevel) eq "debug") { $loglevel = 3; }
-  elsif(lc($loglevel) eq "trace") { $loglevel = 4; }
-  elsif($loglevel =~ /^[0-9]+$/)  { ; }
-  else                            { $loglevel = 1; }
+  $loglevel = { error => 0, warn => 1, warning => 1, info => 2, debug => 3, trace => 4 }->{$loglevel} // $loglevel;
+  unless($loglevel =~ /^[0-9]+$/) {
+    ERROR "Unknown loglevel: $loglevel";
+    HELP_MESSAGE(0);
+    exit 2;
+  }
   require_data_dumper() if(($loglevel >= 4) || ($VERSION =~ /-dev$/));
 
   # DEPRECATED options
diff --git a/doc/btrbk.1.asciidoc b/doc/btrbk.1.asciidoc
index e979b04..a744a26 100644
--- a/doc/btrbk.1.asciidoc
+++ b/doc/btrbk.1.asciidoc
@@ -106,7 +106,7 @@ OPTIONS
     on disk space (ENOSPC).
 
 -v, --verbose::
-    Verbose output (shortcut for "--loglevel=info").
+    Increase the logging level, see "--loglevel".
 
 -q, --quiet::
     Quiet operation. If set, btrbk does not print the summary after
@@ -114,8 +114,8 @@ OPTIONS
     commands.
 
 -l, --loglevel <level>::
-    Set the level of verbosity. Accepted levels are warn, info, debug,
-    and trace.
+    Set the level of verbosity for the stderr logging. Accepted levels
+    are: error, warn, info, debug, and trace. Default is info.
 
 -t, --table::
     Print output in table format (shortcut for "--format=table").