aboutsummaryrefslogtreecommitdiff
path: root/zenserver/compute/apply.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'zenserver/compute/apply.cpp')
-rw-r--r--zenserver/compute/apply.cpp130
1 files changed, 23 insertions, 107 deletions
diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp
index 94dedf087..6eeb6cf70 100644
--- a/zenserver/compute/apply.cpp
+++ b/zenserver/compute/apply.cpp
@@ -89,7 +89,7 @@ BasicFunctionJob::SpawnJob(std::filesystem::path ExePath, std::wstring CommandLi
m_ProcessHandle.Attach(ProcessInfo.hProcess);
::CloseHandle(ProcessInfo.hThread);
- spdlog::info("Created process {}", m_ProcessId);
+ ZEN_INFO("Created process {}", m_ProcessId);
return true;
}
@@ -125,12 +125,12 @@ BasicFunctionJob::ExitCode()
if (!Success)
{
- spdlog::warn("failed getting exit code");
+ ZEN_WARN("failed getting exit code");
}
if (Ec == STILL_ACTIVE)
{
- spdlog::warn("getting exit code but process is STILL_ACTIVE");
+ ZEN_WARN("getting exit code but process is STILL_ACTIVE");
}
return gsl::narrow_cast<int>(Ec);
@@ -231,7 +231,7 @@ SandboxedFunctionJob::Initialize(std::string_view AppContainerId)
if (FAILED(hRes))
{
- spdlog::error("Failed creating app container SID");
+ ZEN_ERROR("Failed creating app container SID");
}
}
@@ -240,12 +240,12 @@ SandboxedFunctionJob::Initialize(std::string_view AppContainerId)
PWSTR Str = nullptr;
::ConvertSidToStringSid(m_AppContainerSid, &Str);
- spdlog::info("AppContainer SID : '{}'", WideToUtf8(Str));
+ ZEN_INFO("AppContainer SID : '{}'", WideToUtf8(Str));
PWSTR Path = nullptr;
if (SUCCEEDED(::GetAppContainerFolderPath(Str, &Path)))
{
- spdlog::info("AppContainer folder: '{}'", WideToUtf8(Path));
+ ZEN_INFO("AppContainer folder: '{}'", WideToUtf8(Path));
::CoTaskMemFree(Path);
}
@@ -321,13 +321,13 @@ SandboxedFunctionJob::SpawnJob(std::filesystem::path ExePath)
return false;
}
- spdlog::info("Created process {}", ProcessInfo.dwProcessId);
+ ZEN_INFO("Created process {}", ProcessInfo.dwProcessId);
return true;
}
HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore, const std::filesystem::path& BaseDir)
-: m_Log("apply", begin(spdlog::default_logger()->sinks()), end(spdlog::default_logger()->sinks()))
+: m_Log(logging::Get("apply"))
, m_CasStore(Store)
, m_CidStore(InCidStore)
, m_SandboxPath(BaseDir / "scratch")
@@ -390,7 +390,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
m_WorkerMap.insert_or_assign(WorkerId, WorkerDesc{FunctionSpec});
- spdlog::debug("worker {}: all attachments already available", WorkerId);
+ ZEN_DEBUG("worker {}: all attachments already available", WorkerId);
return HttpReq.WriteResponse(HttpResponseCode::NoContent);
}
@@ -401,14 +401,14 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
for (const IoHash& Hash : ChunkSet.GetChunkSet())
{
- spdlog::debug("worker {}: need chunk {}", WorkerId, Hash);
+ ZEN_DEBUG("worker {}: need chunk {}", WorkerId, Hash);
ResponseWriter.AddHash(Hash);
}
ResponseWriter.EndArray();
- spdlog::debug("worker {}: need {} attachments", WorkerId, ChunkSet.GetChunkSet().size());
+ ZEN_DEBUG("worker {}: need {} attachments", WorkerId, ChunkSet.GetChunkSet().size());
return HttpReq.WriteResponse(HttpResponseCode::NotFound, ResponseWriter.Save());
}
@@ -453,12 +453,12 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
}
}
- spdlog::debug("worker {}: {} in {} attachments, {} in {} new attachments",
- WorkerId,
- zen::NiceBytes(TotalAttachmentBytes),
- AttachmentCount,
- zen::NiceBytes(TotalNewBytes),
- NewAttachmentCount);
+ ZEN_DEBUG("worker {}: {} in {} attachments, {} in {} new attachments",
+ WorkerId,
+ zen::NiceBytes(TotalAttachmentBytes),
+ AttachmentCount,
+ zen::NiceBytes(TotalNewBytes),
+ NewAttachmentCount);
RwLock::ExclusiveLockScope _(m_WorkerLock);
@@ -597,11 +597,11 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
}
}
- spdlog::debug("new action: {}B in {} attachments. {}B new ({} attachments)",
- zen::NiceBytes(TotalAttachmentBytes),
- AttachmentCount,
- zen::NiceBytes(TotalNewBytes),
- NewAttachmentCount);
+ ZEN_DEBUG("new action: {} in {} attachments. {} new ({} attachments)",
+ zen::NiceBytes(TotalAttachmentBytes),
+ AttachmentCount,
+ zen::NiceBytes(TotalNewBytes),
+ NewAttachmentCount);
CbPackage Output = ExecAction(Worker, ActionObj);
@@ -613,90 +613,6 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
}
},
HttpVerb::kPost);
-
- // This is just for reference
- m_Router.RegisterRoute(
- "jobs/noop",
- [this](HttpRouterRequest& Req) {
- HttpServerRequest& HttpReq = Req.ServerRequest();
-
- switch (HttpReq.RequestVerb())
- {
- case HttpVerb::kGet:
- break;
-
- case HttpVerb::kPost:
- {
- IoBuffer Payload = HttpReq.ReadPayload();
- CbObject RequestObject = LoadCompactBinaryObject(Payload);
-
- bool AllOk = true;
-
- std::vector<IoHash> NeedList;
-
- std::filesystem::path SandboxDir{CreateNewSandbox()};
-
- spdlog::debug("setting up job in sandbox '{}'", SandboxDir);
-
- zen::DeleteDirectories(SandboxDir);
- zen::CreateDirectories(SandboxDir);
-
- for (auto Entry : RequestObject["files"sv])
- {
- CbObjectView Ob = Entry.AsObjectView();
-
- std::string_view FileName = Ob["file"sv].AsString();
- const IoHash FileHash = Ob["hash"sv].AsHash();
- uint64_t FileSize = Ob["size"sv].AsUInt64();
-
- if (IoBuffer Chunk = m_CasStore.FindChunk(FileHash); !Chunk)
- {
- spdlog::debug("MISSING: {} {} {}", FileHash, FileName, FileSize);
- AllOk = false;
-
- NeedList.push_back(FileHash);
- }
- else
- {
- std::filesystem::path FullPath = SandboxDir / FileName;
-
- const IoBuffer* Chunks[] = {&Chunk};
-
- zen::WriteFile(FullPath, Chunks, 1);
- }
- }
-
- if (!AllOk)
- {
- // TODO: Could report all the missing pieces in the response here
- return HttpReq.WriteResponse(HttpResponseCode::NotFound);
- }
-
- std::string Executable8{RequestObject["cmd"].AsString()};
- std::string Args8{RequestObject["args"].AsString()};
-
- std::wstring Executable = Utf8ToWide(Executable8);
- std::wstring Args = Utf8ToWide(Args8);
-
- spdlog::debug("spawning job in sandbox '{}': '{}' '{}'", SandboxDir, Executable8, Args8);
-
- std::filesystem::path ExeName = SandboxDir / Executable;
-
- BasicFunctionJob Job;
- Job.SetWorkingDirectory(SandboxDir);
- Job.SpawnJob(ExeName, Args);
- Job.Wait();
-
- CbObjectWriter Response;
-
- Response << "exitcode" << Job.ExitCode();
-
- return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
- }
- break;
- }
- },
- HttpVerb::kGet | HttpVerb::kPost);
}
HttpFunctionService::~HttpFunctionService()
@@ -714,7 +630,7 @@ HttpFunctionService::HandleRequest(HttpServerRequest& Request)
{
if (m_Router.HandleRequest(Request) == false)
{
- m_Log.warn("No route found for {0}", Request.RelativeUri());
+ ZEN_WARN("No route found for {0}", Request.RelativeUri());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-22 09:07:48 +0000