fdsdump: add -v/-q command line options

Author: sedmicha

src/tools/fdsdump/src/main.cpp

@@ -15,6 +15,7 @@
 #include <libfds.h>
 
 #include <common/common.hpp>
+#include <common/logger.hpp>
 #include <lister/lister.hpp>
 #include <aggregator/mode.hpp>
 #include <statistics/mode.hpp>
@@ -29,6 +30,8 @@ main(int argc, char *argv[])
     try {
         Options options {argc, argv};
 
+        Logger::get_instance().set_log_level(options.get_log_level());
+
         if (options.get_help_flag()) {
             Options::print_usage();
             return EXIT_SUCCESS;

src/tools/fdsdump/src/options.cpp

@@ -34,6 +34,8 @@ void Options::print_usage()
     std::cerr << "  -S, --aggregation-values FIELDS  Fields that will be aggregated (default = flows,packets,bytes)\n";
     std::cerr << "  -I, --stats-mode                 Run in statistics mode\n";
     std::cerr << "  --no-biflow-autoignore           Turn off smart ignoring of empty biflow records\n";
+    std::cerr << "  -v, --verbose                    Increase logging verbosity\n";
+    std::cerr << "  -q, --quiet                      Decrease logging verbosity\n";
 }
 
 Options::Options()
@@ -65,6 +67,8 @@ void Options::reset()
     m_biflow_autoignore = true;
 
     m_order_by.clear();
+
+    m_log_level = LogLevel::warning;
 }
 
 /**
@@ -88,6 +92,8 @@ void Options::parse(int argc, char *argv[])
 	parser.add('S', "aggregation-values", true);
 	parser.add("no-biflow-autoignore", false);
 	parser.add('I', "stats-mode", false);
+	parser.add('v', "verbose", false);
+	parser.add('q', "quiet", false);
 
     Args args;
 	try {
@@ -141,6 +147,14 @@ void Options::parse(int argc, char *argv[])
 	if (args.has('I')) {
 		m_mode = Mode::stats;
 	}
+
+    for (int i = 0; i < args.count('v'); i++) {
+        m_log_level++;
+    }
+
+    for (int i = 0; i < args.count('q'); i++) {
+        m_log_level--;
+    }
 }
 
 void Options::validate()

src/tools/fdsdump/src/options.hpp

@@ -15,6 +15,8 @@
 #include <vector>
 #include <stdexcept>
 
+#include <common/logger.hpp>
+
 namespace fdsdump {
 
 class OptionsException : public std::invalid_argument {
@@ -89,6 +91,9 @@ class Options {
     /** @brief Get output order specificiation           */
     const std::string &get_order_by() const { return m_order_by; };
 
+    /** @brief Get the logging level */
+    LogLevel get_log_level() const { return m_log_level; }
+
 private:
     Mode m_mode;
 
@@ -107,6 +112,8 @@ class Options {
 
     bool        m_biflow_autoignore;
 
+    LogLevel    m_log_level;
+
     void parse(int argc, char *argv[]);
     void validate();
 };