From 4e1dbbbecf14b322dcd164ff1b73c3a7ed4ccb26 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergeant@mz.com>
Date: Sun, 1 Sep 2019 10:45:51 -0700
Subject: [PATCH] quiet mode

---
 ws/ws.cpp          |  3 ++-
 ws/ws.h            |  2 +-
 ws/ws_autobahn.cpp | 45 +++++++++++++++++++++++++--------------------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/ws/ws.cpp b/ws/ws.cpp
index 3b4f2b95..bc6bd9e0 100644
--- a/ws/ws.cpp
+++ b/ws/ws.cpp
@@ -228,6 +228,7 @@ int main(int argc, char** argv)
 
     CLI::App* autobahnApp = app.add_subcommand("autobahn", "Test client Autobahn compliance");
     autobahnApp->add_option("--url", url, "url");
+    autobahnApp->add_flag("-q", quiet, "Quiet");
 
     CLI11_PARSE(app, argc, argv);
 
@@ -333,7 +334,7 @@ int main(int argc, char** argv)
     }
     else if (app.got_subcommand("autobahn"))
     {
-        ret = ix::ws_autobahn_main(url);
+        ret = ix::ws_autobahn_main(url, quiet);
     }
 
     ix::uninitNetSystem();
diff --git a/ws/ws.h b/ws/ws.h
index 3a477667..7208fc7a 100644
--- a/ws/ws.h
+++ b/ws/ws.h
@@ -103,5 +103,5 @@ namespace ix
 
     int ws_httpd_main(int port, const std::string& hostname);
 
-    int ws_autobahn_main(const std::string& url);
+    int ws_autobahn_main(const std::string& url, bool quiet);
 } // namespace ix
diff --git a/ws/ws_autobahn.cpp b/ws/ws_autobahn.cpp
index 7a9abd86..3f4f0f0a 100644
--- a/ws/ws_autobahn.cpp
+++ b/ws/ws_autobahn.cpp
@@ -16,7 +16,7 @@ namespace ix
     class AutobahnTestCase
     {
         public:
-            AutobahnTestCase(const std::string& _url);
+            AutobahnTestCase(const std::string& _url, bool quiet);
             void run();
 
         private:
@@ -26,14 +26,17 @@ namespace ix
             ix::WebSocket _webSocket;
 
             std::atomic<bool> _done;
+            bool _quiet;
     };
 
-    AutobahnTestCase::AutobahnTestCase(const std::string& url) :
+    AutobahnTestCase::AutobahnTestCase(const std::string& url, bool quiet) :
         _url(url),
-        _done(false)
+        _done(false),
+        _quiet(quiet)
     {
         _webSocket.disableAutomaticReconnection();
 
+        // FIXME: this should be on by default
         ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(
             true, false, false, 15, 15);
         _webSocket.setPerMessageDeflateOptions(webSocketPerMessageDeflateOptions);
@@ -41,7 +44,10 @@ namespace ix
 
     void AutobahnTestCase::log(const std::string& msg)
     {
-        std::cerr << msg << std::endl;
+        if (!_quiet)
+        {
+            std::cerr << msg;
+        }
     }
 
     void AutobahnTestCase::run()
@@ -58,11 +64,11 @@ namespace ix
                 if (msg->type == ix::WebSocketMessageType::Open)
                 {
                     log("autobahn: connected");
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
-                    std::cout << "Handshake Headers:" << std::endl;
+                    ss << "Uri: " << msg->openInfo.uri << std::endl;
+                    ss << "Handshake Headers:" << std::endl;
                     for (auto it : msg->openInfo.headers)
                     {
-                        std::cout << it.first << ": " << it.second << std::endl;
+                        ss << it.first << ": " << it.second << std::endl;
                     }
                 }
                 else if (msg->type == ix::WebSocketMessageType::Close)
@@ -70,17 +76,16 @@ namespace ix
                     ss << "autobahn: connection closed:";
                     ss << " code " << msg->closeInfo.code;
                     ss << " reason " << msg->closeInfo.reason << std::endl;
-                    log(ss.str());
 
                     _done = true;
                 }
                 else if (msg->type == ix::WebSocketMessageType::Message)
                 {
-                    std::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
+                    ss << "Received " << msg->wireSize << " bytes" << std::endl;
 
-                    // ss << "autobahn: received message: "
-                    //    << msg->str;
-                    // log(ss.str());
+                    ss << "autobahn: received message: "
+                       << msg->str
+                       << std::endl;
 
                     _webSocket.send(msg->str, msg->binary);
                 }
@@ -90,28 +95,28 @@ namespace ix
                     ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
                     ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
                     ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
-                    log(ss.str());
 
                     // And error can happen, in which case the test-case is marked done
                     _done = true;
                 }
                 else if (msg->type == ix::WebSocketMessageType::Fragment)
                 {
-                    std::cerr << "Received message fragment" << std::endl;
+                    ss << "Received message fragment" << std::endl;
                 }
                 else if (msg->type == ix::WebSocketMessageType::Ping)
                 {
-                    std::cerr << "Received ping" << std::endl;
+                    ss << "Received ping" << std::endl;
                 }
                 else if (msg->type == ix::WebSocketMessageType::Pong)
                 {
-                    std::cerr << "Received pong" << std::endl;
+                    ss << "Received pong" << std::endl;
                 }
                 else
                 {
-                    ss << "Invalid ix::WebSocketMessageType";
-                    log(ss.str());
+                    ss << "Invalid ix::WebSocketMessageType" << std::endl;
                 }
+
+                log(ss.str());
             });
 
         _webSocket.start();
@@ -129,7 +134,7 @@ namespace ix
     //
     // make && bench ws autobahn --url 'ws://localhost:9001/runCase?case=9&agent=ixwebsocket' && ws connect -d 'ws://localhost:9001/updateReports?agent=ixwebsocket'
     //
-    int ws_autobahn_main(const std::string& url)
+    int ws_autobahn_main(const std::string& url, bool quiet)
     {
         int N = 1; // 519;
         N++;
@@ -144,7 +149,7 @@ namespace ix
 
             std::string url(ss.str());
 
-            AutobahnTestCase testCase(url);
+            AutobahnTestCase testCase(url, quiet);
             testCase.run();
         }