-vvv would not dump traffic, use -d

satori-com · Jan 17, 2017 · c760212 · c760212
1 parent 22d3ed3
commit c760212
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@
     * Support rsv1, rsv2, rsv3 reserved flags in in \{ws.* <reserved-flag>}.
     * Fix statsd output for connections.opened.
     * Support for \{raw Expression}, which removes ws framing.
+    * '-vvv' option does not dump the traffic. Use -d or --dump-* options.
 
 1.0:  2016-Sep-29
     * Export --latency-connect and --latency-first-bytes to statsd.

diff --git a/src/tcpkali.c b/src/tcpkali.c
@@ -248,8 +248,6 @@ main(int argc, char **argv) {
             if(engine_params.verbosity_level >= _DBG_MAX) {
                 engine_params.verbosity_level = (_DBG_MAX - 1);
             }
-            if(engine_params.verbosity_level >= DBG_DATA)
-                engine_params.dump_setting = DS_DUMP_ALL;
             break;
         case 'H': {
             char *hdrbuf = strdup(optarg);
@@ -295,8 +293,6 @@ main(int argc, char **argv) {
                 fprintf(stderr, "Expecting --verbose=[0..%d]\n", _DBG_MAX - 1);
                 exit(EX_USAGE);
             }
-            if(engine_params.verbosity_level >= DBG_DATA)
-                engine_params.dump_setting = DS_DUMP_ALL;
             break;
         case 'd': /* -d */
         /* FALL THROUGH */

diff --git a/src/tcpkali_engine.c b/src/tcpkali_engine.c
@@ -1079,7 +1079,7 @@ single_engine_loop_thread(void *argp) {
               hdr_value_at_percentile(hist, 99.0) / 10.0,
               hdr_value_at_percentile(hist, 99.5) / 10.0, hdr_mean(hist) / 10.0,
               hdr_max(hist) / 10.0);
-        if(largs->params.verbosity_level >= DBG_DATA)
+        if(largs->params.verbosity_level >= DBG_DEBUG)
             hdr_percentiles_print(hist, stderr, 5, 10, CLASSIC);
     }
     if(largs->marker_histogram_local) {
@@ -1095,7 +1095,7 @@ single_engine_loop_thread(void *argp) {
               hdr_value_at_percentile(hist, 99.0) / 10.0,
               hdr_value_at_percentile(hist, 99.5) / 10.0, hdr_mean(hist) / 10.0,
               hdr_max(hist) / 10.0);
-        if(largs->params.verbosity_level >= DBG_DATA)
+        if(largs->params.verbosity_level >= DBG_DEBUG)
             hdr_percentiles_print(hist, stderr, 5, 10, CLASSIC);
     }
 

diff --git a/src/tcpkali_logging.h b/src/tcpkali_logging.h
@@ -35,7 +35,7 @@ enum verbosity_level {
     DBG_NORMAL = 1,  /* Default verbosity level */
     DBG_WARNING = 1, /* Deliberately the same as "normal" */
     DBG_DETAIL = 2,  /* Increased verbosity */
-    DBG_DATA = 3,    /* Dump incoming and outgoing data as well */
+    DBG_DEBUG = 3,   /* Dump latency tables */
     _DBG_MAX
 };