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>

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c
index 9c73b2a..a673a30 100644
--- a/lib/ipmi_main.c
+++ b/lib/ipmi_main.c
@@ -358,12 +358,16 @@ ipmi_main(int argc, char ** argv,
 	/* Set program locale according to system settings */
 	setlocale(LC_ALL, "");
 
+
 	/* save program name */
 	progname = strrchr(argv[0], '/');
 	progname = ((!progname) ? argv[0] : progname+1);
 	signal(SIGINT, ipmi_catch_sigint);
 	memset(kgkey, 0, sizeof(kgkey));
 
+	/* setup log */
+	log_init(progname, 0, 0);
+
 	while ((argflag = getopt(argc, (char **)argv, OPTION_STRING)) != -1)
 	{
 		switch (argflag) {
@@ -443,7 +447,11 @@ ipmi_main(int argc, char ** argv,
 			break;
 #endif /* IPMI_INTF_LANPLUS */
 		case 'v':
-			verbose++;
+			log_level_set(++verbose);
+			if (verbose == 2) {
+				/* add version info to debug output */
+				lprintf(LOG_DEBUG, "%s version %s\n", progname, VERSION);
+			}
 			break;
 		case 'c':
 			csv_output = 1;
@@ -844,9 +852,6 @@ ipmi_main(int argc, char ** argv,
 		goto out_free;
 	}
 
-	/* setup log */
-	log_init(progname, 0, verbose);
-
 	/* load the IANA PEN registry */
 	if (ipmi_oem_info_init()) {
 		lprintf(LOG_ERR, "Failed to initialize the OEM info dictionary");