aboutsummaryrefslogtreecommitdiff
path: root/zen/cmds/importproject.cpp
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-12-07 11:36:54 +0100
committerGitHub <[email protected]>2022-12-07 02:36:54 -0800
commitcce239c1d535e047d412ec2ad5ed28ff30d5c955 (patch)
tree59dc18c2c6860d40277f8067e7de6e2e73b003d7 /zen/cmds/importproject.cpp
parentoptimizations (#200) (diff)
downloadarchived-zen-cce239c1d535e047d412ec2ad5ed28ff30d5c955.tar.xz
archived-zen-cce239c1d535e047d412ec2ad5ed28ff30d5c955.zip
Zen cmd fixes (#201)
* updated drop command to support namespaces * fixed hash command error message * fix output of status (and top) command * Use ZEN_CONSOLE for output in zen commands * changelog
Diffstat (limited to 'zen/cmds/importproject.cpp')
-rw-r--r--zen/cmds/importproject.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/zen/cmds/importproject.cpp b/zen/cmds/importproject.cpp
index d6c48cdeb..f92e8fcc0 100644
--- a/zen/cmds/importproject.cpp
+++ b/zen/cmds/importproject.cpp
@@ -65,7 +65,7 @@ ImportProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
cpr::Session Session;
{
- ZEN_INFO("Requesting project '{}' from '{}'", m_ProjectName, m_HostName);
+ ZEN_CONSOLE("Requesting project '{}' from '{}'", m_ProjectName, m_HostName);
zen::BasicFile ProjectStore;
ProjectStore.Open(ExportProjectCommand::GetProjectPath(m_SourcePath, m_ProjectName), zen::BasicFile::Mode::kRead);
@@ -113,7 +113,7 @@ ImportProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
for (const std::string& OplogName : m_OplogNames)
{
- ZEN_INFO("Importing oplog '{}/{}' from '{}' to '{}'", m_ProjectName, OplogName, m_SourcePath, m_HostName);
+ ZEN_CONSOLE("Importing oplog '{}/{}' from '{}' to '{}'", m_ProjectName, OplogName, m_SourcePath, m_HostName);
std::string GetOplogRequest = fmt::format("{}/{}/oplog/{}", UrlBase, m_ProjectName, OplogName);
Session.SetUrl(GetOplogRequest);
cpr::Response OplogResponse = Session.Get();
@@ -149,11 +149,11 @@ ImportProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
sizeof(ExportProjectCommand::OplogEntry) * OplogHeader.OpCount,
sizeof(ExportProjectCommand::OplogHeader));
- ZEN_INFO("Constructing oplog with {} ops with checksum '{}' for '{}/{}'",
- OpEntries.size(),
- OplogHeader.Checksum,
- m_ProjectName,
- OplogName);
+ ZEN_CONSOLE("Constructing oplog with {} ops with checksum '{}' for '{}/{}'",
+ OpEntries.size(),
+ OplogHeader.Checksum,
+ m_ProjectName,
+ OplogName);
zen::IoHashStream Hasher;
zen::CbObjectWriter Request;
Request.BeginArray("entries"sv);
@@ -179,7 +179,7 @@ ImportProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
zen::CbPackage RequestPackage;
RequestPackage.SetObject(Request.Save());
- ZEN_INFO("Assembling {} attachments", ChunksHeader->ChunkCount);
+ ZEN_CONSOLE("Assembling {} attachments", ChunksHeader->ChunkCount);
std::vector<zen::CbAttachment> Attachments;
Attachments.reserve(ChunksHeader->ChunkCount);
uint32_t ReadBlockIndex = 0;
@@ -213,12 +213,12 @@ ImportProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
}
RequestPackage.AddAttachments(Attachments);
- ZEN_INFO("Sending oplog with {} ops and {} attachments for '{}/{}' to {}",
- OpEntries.size(),
- ChunksHeader->ChunkCount,
- m_ProjectName,
- OplogName,
- m_HostName);
+ ZEN_CONSOLE("Sending oplog with {} ops and {} attachments for '{}/{}' to {}",
+ OpEntries.size(),
+ ChunksHeader->ChunkCount,
+ m_ProjectName,
+ OplogName,
+ m_HostName);
std::vector<zen::IoBuffer> RequestPayload = zen::FormatPackageMessage(RequestPackage, zen::FormatFlags::kAllowLocalReferences);
std::vector<zen::SharedBuffer> Parts;
Parts.reserve(RequestPayload.size());
@@ -240,7 +240,7 @@ ImportProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
return 1;
}
- ZEN_INFO("Imported {} ops and {} chunks", OpEntries.size(), ChunksHeader->ChunkCount);
+ ZEN_CONSOLE("Imported {} ops and {} chunks", OpEntries.size(), ChunksHeader->ChunkCount);
}
return 0;
}