RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-01-30 17:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: add global option --log=level

Browse Source 
Add an option to set the log level exactly instead of -vv and similar.
The combined option may not be known to all users as reported and one
option for the level is for convenience.

Issue: #570
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-02-22 01:00:12 +01:00
parent c811ccc6c9
commit 67964cbcda
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
btrfs.c
View File

@ -32,7 +32,7 @@
#include "cmds/commands.h" #include "cmds/commands.h"
static const char * const btrfs_cmd_group_usage[] = { static const char * const btrfs_cmd_group_usage[] = {
"btrfs [--help] [--version] [--format <format>] [-v|--verbose] [-q|--quiet] <group> [<group>...] <command> [<args>]", "btrfs [--help] [--version] [--format <format>] [-v|--verbose] [-q|--quiet] [--log=level] <group> [<group>...] <command> [<args>]",
NULL NULL
}; };
@ -238,6 +238,23 @@ static void handle_output_format(const char *format)
} }
} }
static void handle_log_level(const char *level) {
if (strcasecmp(level, "default") == 0) {
bconf.verbose = LOG_DEFAULT;
} else if (strcasecmp(level, "info") == 0) {
bconf.verbose = LOG_INFO;
} else if (strcasecmp(level, "verbose") == 0) {
bconf.verbose = LOG_VERBOSE;
} else if (strcasecmp(level, "debug") == 0) {
bconf.verbose = LOG_DEBUG;
} else if (strcasecmp(level, "quiet") == 0) {
bconf.verbose = BTRFS_BCONF_QUIET;
} else {
error("unrecognized log level: %s", level);
exit(1);
}
}
/* /*
* Parse global options, between binary name and first non-option argument * Parse global options, between binary name and first non-option argument
* after processing all valid options (including those with arguments). * after processing all valid options (including those with arguments).
@ -246,7 +263,7 @@ static void handle_output_format(const char *format)
*/ */
static int handle_global_options(int argc, char **argv) static int handle_global_options(int argc, char **argv)
{ {
enum { OPT_HELP = 256, OPT_VERSION, OPT_FULL, OPT_FORMAT }; enum { OPT_HELP = 256, OPT_VERSION, OPT_FULL, OPT_FORMAT, OPT_LOG };
static const struct option long_options[] = { static const struct option long_options[] = {
{ "help", no_argument, NULL, OPT_HELP }, { "help", no_argument, NULL, OPT_HELP },
{ "version", no_argument, NULL, OPT_VERSION }, { "version", no_argument, NULL, OPT_VERSION },
@ -254,6 +271,7 @@ static int handle_global_options(int argc, char **argv)
{ "full", no_argument, NULL, OPT_FULL }, { "full", no_argument, NULL, OPT_FULL },
{ "verbose", no_argument, NULL, 'v' }, { "verbose", no_argument, NULL, 'v' },
{ "quiet", no_argument, NULL, 'q' }, { "quiet", no_argument, NULL, 'q' },
{ "log", required_argument, NULL, OPT_LOG },
{ NULL, 0, NULL, 0} { NULL, 0, NULL, 0}
}; };
int shift; int shift;
@ -276,6 +294,9 @@ static int handle_global_options(int argc, char **argv)
case OPT_FORMAT: case OPT_FORMAT:
handle_output_format(optarg); handle_output_format(optarg);
break; break;
case OPT_LOG:
handle_log_level(optarg);
break;
case 'v': case 'v':
bconf_be_verbose(); bconf_be_verbose();
break; break;