summaryrefslogtreecommitdiff
path: root/lib/ipmi_strings.c
diff options
context:
space:
mode:
authorAlexander Amelkin <alexander@amelkin.msk.ru>2020-07-17 03:29:42 +0300
committerAlexander Amelkin <alexander@amelkin.msk.ru>2020-07-17 03:33:46 +0300
commitdc163d4cdc5c18daf27428f3409d8c8a8761a23c (patch)
tree1992ca0d91944ce8f26f42c34a16873c0d0381ac /lib/ipmi_strings.c
parent3a1a9cb28320cf3ea712d53403b983abdd49d923 (diff)
downloadipmitool-feature/debug-improvements.tar.gz
Add version info to debug outputfeature/debug-improvements
- Initialize the log at the start of ipmi_main() to allow for proper logging at the start; - Remove the unused log_level_get() function; - Update log_level_set() to take verbosity instead of log level (default verbosity is 0, which is LOG_NOTICE log level), use the function to update log level as `-v` is encountered in command line; - Move IANA PEN list debugging to verbosity 6. The list is too long to see it in each debug output of verbosity 5 that is used for debugging lan/lanplus packets; - For verbosity >= 2 (that is `-vv`) add the ipmitool version information at the start. Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
Diffstat (limited to 'lib/ipmi_strings.c')
-rw-r--r--lib/ipmi_strings.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c
index 9fc6b61..8d27e40 100644
--- a/lib/ipmi_strings.c
+++ b/lib/ipmi_strings.c
@@ -1631,6 +1631,7 @@ oem_info_init_from_list(oem_valstr_list_t *oemlist, size_t count)
size_t tail_entries = ARRAY_SIZE(ipmi_oem_info_tail) - 1;
static oem_valstr_list_t *item;
bool rc = false;
+ int oemlist_debug = LOG_DEBUG + 4; /* Require six -v options */
/* Include static entries and the terminator */
count += head_entries + tail_entries + 1;
@@ -1653,7 +1654,7 @@ oem_info_init_from_list(oem_valstr_list_t *oemlist, size_t count)
goto out;
}
- lprintf(LOG_DEBUG + 3, " Allocating %6zu entries", count);
+ lprintf(oemlist_debug, " Allocating %6zu entries", count);
/* Add a terminator at the very end */
--count;
@@ -1665,7 +1666,7 @@ oem_info_init_from_list(oem_valstr_list_t *oemlist, size_t count)
((struct valstr *)ipmi_oem_info)[count] =
ipmi_oem_info_tail[tail_entries];
- lprintf(LOG_DEBUG + 3, " [%6zu] %8d | %s", count,
+ lprintf(oemlist_debug, " [%6zu] %8d | %s", count,
ipmi_oem_info[count].val, ipmi_oem_info[count].str);
}
@@ -1675,7 +1676,7 @@ oem_info_init_from_list(oem_valstr_list_t *oemlist, size_t count)
((struct valstr *)ipmi_oem_info)[count] =
item->valstr;
- lprintf(LOG_DEBUG + 3, " [%6zu] %8d | %s", count,
+ lprintf(oemlist_debug, " [%6zu] %8d | %s", count,
ipmi_oem_info[count].val, ipmi_oem_info[count].str);
item = item->next;
@@ -1686,7 +1687,7 @@ oem_info_init_from_list(oem_valstr_list_t *oemlist, size_t count)
while (count < SIZE_MAX && head_entries--) {
((struct valstr *)ipmi_oem_info)[count] =
ipmi_oem_info_head[head_entries];
- lprintf(LOG_DEBUG + 3, " [%6zu] %8d | %s", count,
+ lprintf(oemlist_debug, " [%6zu] %8d | %s", count,
ipmi_oem_info[count].val, ipmi_oem_info[count].str);
--count;
}