From 91e17ffd0fbf8342b6b30eef2522238d00c9e47a Mon Sep 17 00:00:00 2001
From: Fuat Geleri <geleri@fb.com>
Date: Tue, 20 Jun 2017 10:04:54 -0700
Subject: [PATCH] use folly::humanify to eliminate unprintable characters to
 dirty the log output

---
 src/Payload.cpp       | 25 +++++++++++--------------
 src/framing/Frame.cpp |  4 ++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/Payload.cpp b/src/Payload.cpp
index 5d0a0da10..4670e0af6 100644
--- a/src/Payload.cpp
+++ b/src/Payload.cpp
@@ -24,30 +24,27 @@ void Payload::checkFlags(FrameFlags flags) const {
 }
 
 std::ostream& operator<<(std::ostream& os, const Payload& payload) {
-  return os << "[Metadata("
+  return os << "Metadata("
             << (payload.metadata
                     ? folly::to<std::string>(
                           payload.metadata->computeChainDataLength())
                     : "0")
-            << (payload.metadata ? "): '" +
-                        payload.metadata->cloneAsValue()
-                            .moveToFbString()
-                            .substr(0, 40)
-                            .toStdString() +
+            << (payload.metadata
+                    ? "): '" +
+                        folly::humanify(
+                            payload.metadata->cloneAsValue().moveToFbString().substr(0, 80)) +
                         "'"
-                                 : "): <nullptr>")
+                    : "): <null>")
             << ", Data("
             << (payload.data ? folly::to<std::string>(
                                    payload.data->computeChainDataLength())
                              : "0")
-            << (payload.data ? "): '" +
-                        payload.data->cloneAsValue()
-                            .moveToFbString()
-                            .substr(0, 40)
-                            .toStdString() +
+            << (payload.data
+                    ? "): '" +
+                        folly::humanify(
+                            payload.data->cloneAsValue().moveToFbString().substr(0, 80)) +
                         "'"
-                             : "): <nullptr>")
-            << "]";
+                    : "): <null>");
 }
 
 std::string Payload::moveDataToString() {
diff --git a/src/framing/Frame.cpp b/src/framing/Frame.cpp
index 69b2d7768..ebcb8a406 100644
--- a/src/framing/Frame.cpp
+++ b/src/framing/Frame.cpp
@@ -209,7 +209,7 @@ Frame_PAYLOAD Frame_PAYLOAD::complete(StreamId streamId) {
 }
 
 std::ostream& operator<<(std::ostream& os, const Frame_PAYLOAD& frame) {
-  return os << frame.header_ << ", (" << frame.payload_;
+  return os << frame.header_ << ", " << frame.payload_;
 }
 
 Frame_ERROR Frame_ERROR::unexpectedFrame() {
@@ -255,7 +255,7 @@ std::ostream& operator<<(std::ostream& os, const Frame_KEEPALIVE& frame) {
 
 std::ostream& operator<<(std::ostream& os, const Frame_SETUP& frame) {
   return os << frame.header_ << ", Version: " << frame.versionMajor_ << "."
-            << frame.versionMinor_ << ", (" << frame.payload_;
+            << frame.versionMinor_ << ", " << frame.payload_;
 }
 
 void Frame_SETUP::moveToSetupPayload(SetupParameters& setupPayload) {