Skip to content

B
brpc
Commit 6d3a6e1e authored by jamesge's avatar jamesge
Browse files
Options

Add :: before namespace logging

parent 00498f23
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/brpc/controller.cpp
View file @ 6d3a6e1e
...@@ -1509,7 +1509,7 @@ void Controller::FlushSessionKV(std::ostream& os) { ...@@ -1509,7 +1509,7 @@ void Controller::FlushSessionKV(std::ostream& os) {
pRID = _http_request->GetHeader(FLAGS_request_id_header); pRID = _http_request->GetHeader(FLAGS_request_id_header);
} }
if (logging::FLAGS_log_as_json) { if (::logging::FLAGS_log_as_json) {
os << "\"M\":\"" BRPC_SESSION_END_MSG "\""; os << "\"M\":\"" BRPC_SESSION_END_MSG "\"";
if (pRID) { if (pRID) {
os << ",\"" BRPC_REQ_ID "\":\"" << *pRID << '"'; os << ",\"" BRPC_REQ_ID "\":\"" << *pRID << '"';
...@@ -1534,7 +1534,7 @@ Controller::LogPostfixDummy::~LogPostfixDummy() { ...@@ -1534,7 +1534,7 @@ Controller::LogPostfixDummy::~LogPostfixDummy() {
std::ostream& operator<<(std::ostream& os, const Controller::LogPostfixDummy& p) { std::ostream& operator<<(std::ostream& os, const Controller::LogPostfixDummy& p) {
const_cast<brpc::Controller::LogPostfixDummy&>(p).osptr = &os; const_cast<brpc::Controller::LogPostfixDummy&>(p).osptr = &os;
if (logging::FLAGS_log_as_json) { if (::logging::FLAGS_log_as_json) {
os << "\"M\":\""; os << "\"M\":\"";
} }
return os; return os;
...@@ -1544,14 +1544,14 @@ std::ostream& operator<<(std::ostream& os, const Controller::LogPostfixDummy& p) ...@@ -1544,14 +1544,14 @@ std::ostream& operator<<(std::ostream& os, const Controller::LogPostfixDummy& p)
Controller::LogPostfixDummy Controller::LogPostfix() const { Controller::LogPostfixDummy Controller::LogPostfix() const {
Controller::LogPostfixDummy result; Controller::LogPostfixDummy result;
std::string& p = result.postfix; std::string& p = result.postfix;
if (logging::FLAGS_log_as_json) { if (::logging::FLAGS_log_as_json) {
p.push_back('"'); p.push_back('"');
} }
const std::string* pRID = nullptr; const std::string* pRID = nullptr;
if (_http_request) { if (_http_request) {
pRID = _http_request->GetHeader(FLAGS_request_id_header); pRID = _http_request->GetHeader(FLAGS_request_id_header);
if (pRID) { if (pRID) {
if (logging::FLAGS_log_as_json) { if (::logging::FLAGS_log_as_json) {
p.append(",\"" BRPC_REQ_ID "\":\""); p.append(",\"" BRPC_REQ_ID "\":\"");
p.append(*pRID); p.append(*pRID);
p.push_back('"'); p.push_back('"');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment