aboutsummaryrefslogtreecommitdiff
path: root/zen/cmds/run.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-15 19:49:20 +0200
committerStefan Boberg <[email protected]>2021-09-15 19:49:20 +0200
commit83ccd52321a23c8f1c8a3228cbbf34b8f199a22b (patch)
tree9cf1fb68651f616aef2fa28000e4f328ef9204d8 /zen/cmds/run.cpp
parentAdded GetSize/GetData functions to reduce cognitive load and bridge the gap b... (diff)
parentTweaked logging to streamline access, and simplified setup code for new loggers (diff)
downloadarchived-zen-83ccd52321a23c8f1c8a3228cbbf34b8f199a22b.tar.xz
archived-zen-83ccd52321a23c8f1c8a3228cbbf34b8f199a22b.zip
Merge branch 'main' into cbpackage-update
Diffstat (limited to 'zen/cmds/run.cpp')
-rw-r--r--zen/cmds/run.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/zen/cmds/run.cpp b/zen/cmds/run.cpp
index 3427a6efc..e5210f695 100644
--- a/zen/cmds/run.cpp
+++ b/zen/cmds/run.cpp
@@ -9,11 +9,11 @@
#include <zencore/filesystem.h>
#include <zencore/fmtutils.h>
#include <zencore/iohash.h>
+#include <zencore/logging.h>
#include <zencore/string.h>
#include <zencore/timer.h>
#include <zenserverprocess.h>
-#include <spdlog/spdlog.h>
#include <filesystem>
// cpr ////////////////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ RunCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
zen::IoHash Hash = Ios.GetHash();
std::wstring RelativePath = FullPath.lexically_relative(m_RootPath).native();
- // spdlog::info("File: {:32} => {} ({})", zen::WideToUtf8(RelativePath), Hash, FileSize);
+ // ZEN_INFO("File: {:32} => {} ({})", zen::WideToUtf8(RelativePath), Hash, FileSize);
FileEntry& Entry = m_Files[RelativePath];
Entry.Hash = Hash;
@@ -164,12 +164,12 @@ RunCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
if (CasResponse.status_code >= 300)
{
- spdlog::error("CAS put failed with {}", CasResponse.status_code);
+ ZEN_ERROR("CAS put failed with {}", CasResponse.status_code);
}
}
else
{
- spdlog::error("unknown hash in 'need' list: {}", NeedHash);
+ ZEN_ERROR("unknown hash in 'need' list: {}", NeedHash);
}
}
}
@@ -177,7 +177,7 @@ RunCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
cpr::Response JobResponse =
cpr::Post(cpr::Url("http://localhost:13337/exec/jobs"), cpr::Body((const char*)MemOut.Data(), MemOut.Size()));
- spdlog::info("job exec: {}", JobResponse.status_code);
+ ZEN_INFO("job exec: {}", JobResponse.status_code);
return 0;
}