diff options
| -rw-r--r-- | zen/cmds/projectstore.cpp | 24 | ||||
| -rw-r--r-- | zen/cmds/rpcreplay.cpp | 8 | ||||
| -rw-r--r-- | zen/zen.cpp | 2 | ||||
| -rw-r--r-- | zen/zen.h | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/zen/cmds/projectstore.cpp b/zen/cmds/projectstore.cpp index e12b85edc..97c815241 100644 --- a/zen/cmds/projectstore.cpp +++ b/zen/cmds/projectstore.cpp @@ -207,7 +207,7 @@ CreateProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a Response = Session.Post(); } - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } @@ -275,7 +275,7 @@ CreateOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg Response = Session.Post(); } - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } @@ -424,13 +424,13 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg Response = Session.Post(); if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } } else if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } else if (m_ZenClean) @@ -439,13 +439,13 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg Response = Session.Delete(); if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } Response = Session.Post(); if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } } @@ -551,7 +551,7 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg ZEN_CONSOLE("Saving oplog '{}/{}' from '{}' to {}", m_ProjectName, m_OplogName, m_HostName, TargetDescription); cpr::Response Response = Session.Post(); - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } @@ -685,13 +685,13 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg Response = Session.Post(); if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } } else if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } else if (m_ZenClean) @@ -700,13 +700,13 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg Response = Session.Delete(); if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } Response = Session.Post(); if (!zen::IsHttpSuccessCode(Response.status_code)) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } } @@ -778,6 +778,6 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg ZEN_CONSOLE("Loading oplog '{}/{}' from '{}' to {}", m_ProjectName, m_OplogName, SourceDescription, m_HostName); Response = Session.Post(); - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } diff --git a/zen/cmds/rpcreplay.cpp b/zen/cmds/rpcreplay.cpp index 90edb949d..366b67104 100644 --- a/zen/cmds/rpcreplay.cpp +++ b/zen/cmds/rpcreplay.cpp @@ -54,7 +54,7 @@ RpcStartRecordingCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char Session.SetUrl(fmt::format("{}/z$/exec$/start-recording"sv, m_HostName)); Session.SetParameters({{"path", m_RecordingPath}}); cpr::Response Response = Session.Post(); - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } @@ -81,7 +81,7 @@ RpcStopRecordingCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char* cpr::Session Session; Session.SetUrl(fmt::format("{}/z$/exec$/stop-recording"sv, m_HostName)); cpr::Response Response = Session.Post(); - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } @@ -177,7 +177,7 @@ RpcReplayCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) Session.SetUrl(fmt::format("{}/z$/exec$/replay-recording"sv, m_HostName)); Session.SetParameters({{"path", m_RecordingPath}, {"thread-count", fmt::format("{}", m_ThreadCount)}}); cpr::Response Response = Session.Post(); - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); return GetReturnCode(Response); } @@ -367,7 +367,7 @@ RpcReplayCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) if (Response.error || !(IsHttpSuccessCode(Response.status_code) || Response.status_code == gsl::narrow<long>(HttpResponseCode::NotFound))) { - ZEN_CONSOLE("{}", FormatResponse(Response)); + ZEN_CONSOLE("{}", FormatHttpResponse(Response)); break; } BytesReceived.fetch_add(Response.downloaded_bytes); diff --git a/zen/zen.cpp b/zen/zen.cpp index 754b1f0a6..a085af2c0 100644 --- a/zen/zen.cpp +++ b/zen/zen.cpp @@ -93,7 +93,7 @@ ZenCmdBase::ParseOptions(int argc, char** argv) } std::string -ZenCmdBase::FormatResponse(const cpr::Response& Response) +ZenCmdBase::FormatHttpResponse(const cpr::Response& Response) { if (Response.error.code != cpr::ErrorCode::OK) { @@ -33,6 +33,6 @@ public: virtual cxxopts::Options& Options() = 0; bool ParseOptions(int argc, char** argv); - static std::string FormatResponse(const cpr::Response& Response); + static std::string FormatHttpResponse(const cpr::Response& Response); static int GetReturnCode(const cpr::Response& Response); }; |