diff options
| author | Dan Engelbrecht <[email protected]> | 2024-02-12 14:50:46 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-12 14:50:46 +0100 |
| commit | ac3ca061ac4dcf107f3b0f60bb58d40b199458d8 (patch) | |
| tree | dd62b20546928d54e87e5fb9c57fc899a0627a5b /src/zen/cmds/projectstore_cmd.cpp | |
| parent | Save compressed large attachments to temporary files on disk (#650) (diff) | |
| download | archived-zen-ac3ca061ac4dcf107f3b0f60bb58d40b199458d8.tar.xz archived-zen-ac3ca061ac4dcf107f3b0f60bb58d40b199458d8.zip | |
Added --copy-log, --copy-cache-log and copy-http-log option to zen logs command (#651)
* be safe and use ToText() rather than AsText() when getting http responses
* Added `--copy-log`, `--copy-cache-log` and `copy-http-log` option to zen logs command to copy logs from a local running zen server instance
Diffstat (limited to 'src/zen/cmds/projectstore_cmd.cpp')
| -rw-r--r-- | src/zen/cmds/projectstore_cmd.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/zen/cmds/projectstore_cmd.cpp b/src/zen/cmds/projectstore_cmd.cpp index 0fe7b14eb..2132d428d 100644 --- a/src/zen/cmds/projectstore_cmd.cpp +++ b/src/zen/cmds/projectstore_cmd.cpp @@ -12,6 +12,7 @@ #include <zenhttp/formatters.h> #include <zenhttp/httpclient.h> #include <zenhttp/httpcommon.h> +#include <zenutil/basicfile.h> ZEN_THIRD_PARTY_INCLUDES_START #include <cpr/cpr.h> @@ -54,7 +55,7 @@ namespace { } } - void AsyncPost(HttpClient& Http, std::string_view Url, IoBuffer&& Payload) + void ExecuteAsyncOperation(HttpClient& Http, std::string_view Url, IoBuffer&& Payload) { if (HttpClient::Response Result = Http.Post(Url, Payload)) { @@ -934,7 +935,7 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg HttpClient::Accept(ZenContentType::kJSON)); Result) { - ZEN_CONSOLE("{}", Result.AsText()); + ZEN_CONSOLE("{}", Result.ToText()); } else { @@ -944,7 +945,7 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg } else { - AsyncPost(Http, fmt::format("/prj/{}/oplog/{}/rpc", m_ProjectName, m_OplogName), std::move(Payload)); + ExecuteAsyncOperation(Http, fmt::format("/prj/{}/oplog/{}/rpc", m_ProjectName, m_OplogName), std::move(Payload)); } return 0; } @@ -1090,7 +1091,8 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg } } - HttpClient Http(m_HostName); + HttpClient Http(m_HostName); + std::string Url = fmt::format("/prj/{}/oplog/{}", m_ProjectName, m_OplogName); bool CreateOplog = false; @@ -1213,7 +1215,7 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg HttpClient::Accept(ZenContentType::kJSON)); Result) { - ZEN_CONSOLE("{}", Result.AsText()); + ZEN_CONSOLE("{}", Result.ToText()); } else { @@ -1223,7 +1225,7 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg } else { - AsyncPost(Http, fmt::format("/prj/{}/oplog/{}/rpc", m_ProjectName, m_OplogName), std::move(Payload)); + ExecuteAsyncOperation(Http, fmt::format("/prj/{}/oplog/{}/rpc", m_ProjectName, m_OplogName), std::move(Payload)); } return 0; } @@ -1325,7 +1327,7 @@ ProjectStatsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** ar HttpClient Http(m_HostName); if (HttpClient::Response Result = Http.Get("/stats/prj", HttpClient::Accept(ZenContentType::kJSON))) { - ZEN_CONSOLE("{}", Result.AsText()); + ZEN_CONSOLE("{}", Result.ToText()); return 0; } else @@ -1423,7 +1425,7 @@ ProjectDetailsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** {"attachmentdetails", m_AttachmentDetails ? "true" : "false"}, {"csv", m_CSV ? "true" : "false"}})) { - ZEN_CONSOLE("{}", Result.AsText()); + ZEN_CONSOLE("{}", Result.ToText()); return 0; } else |