Skip to content

Use folly::humanify to eliminate unprintable characters to dirty the logs#534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lehecka merged 1 commit into from
Jun 20, 2017
Merged

Use folly::humanify to eliminate unprintable characters to dirty the logs #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/Payload.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions src/framing/Frame.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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() {
Expand DownExpand Up@@ -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) {
Expand Down