From 3a33d040ddaaa9634ca4fab04e3182e7a8313547 Mon Sep 17 00:00:00 2001 From: Joe Kirchoff Date: Tue, 5 Apr 2022 13:56:02 -0700 Subject: Add pre-commit config (#69) * Add .pre-commit-config.yaml * format all using pre-commit clang-format hook * Add pre-commit to inject unreal header comment * Remove prepare_commit.bat & update CODING.md * Remove check-added-large-files, add headers before clang-format --- zenserver/compute/function.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zenserver/compute/function.cpp') diff --git a/zenserver/compute/function.cpp b/zenserver/compute/function.cpp index 996573573..7c5f33e78 100644 --- a/zenserver/compute/function.cpp +++ b/zenserver/compute/function.cpp @@ -485,8 +485,8 @@ HttpFunctionService::ExecActionUpstream(const WorkerDesc& Worker, CbObject& Obje HttpResponseCode HttpFunctionService::ExecActionUpstreamResult(const IoHash& WorkerId, CbObject& Object) { - const static IoHash Empty = CbObject().GetHash(); - auto Status = m_UpstreamApply->GetStatus(WorkerId, Empty); + const static IoHash Empty = CbObject().GetHash(); + auto Status = m_UpstreamApply->GetStatus(WorkerId, Empty); if (!Status.Success) { return HttpResponseCode::NotFound; -- cgit v1.2.3 From c07ab0b4114a73de3665492c5b62061a8877e25a Mon Sep 17 00:00:00 2001 From: Joe Kirchoff Date: Thu, 14 Apr 2022 11:58:08 -0700 Subject: Compute updates (#74) --- zenserver/compute/function.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'zenserver/compute/function.cpp') diff --git a/zenserver/compute/function.cpp b/zenserver/compute/function.cpp index 7c5f33e78..dd31013ef 100644 --- a/zenserver/compute/function.cpp +++ b/zenserver/compute/function.cpp @@ -53,6 +53,16 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, m_Router.AddPattern("worker", "([[:xdigit:]]{40})"); m_Router.AddPattern("action", "([[:xdigit:]]{40})"); + m_Router.RegisterRoute( + "ready", + [this](HttpRouterRequest& Req) { + HttpServerRequest& HttpReq = Req.ServerRequest(); + + // Todo: check upstream health + return HttpReq.WriteResponse(HttpResponseCode::OK); + }, + HttpVerb::kGet); + m_Router.RegisterRoute( "workers/{worker}", [this](HttpRouterRequest& Req) { @@ -532,6 +542,15 @@ HttpFunctionService::ExecActionUpstreamResult(const IoHash& WorkerId, CbObject& ResultObject.AddString("stdout"sv, Completed.StdOut); ResultObject.AddString("stderr"sv, Completed.StdErr); ResultObject.AddInteger("exitcode"sv, Completed.Error.ErrorCode); + ResultObject.BeginArray("stats"sv); + for (const auto& Timepoint : Completed.Timepoints) + { + ResultObject.BeginObject(); + ResultObject.AddString("name"sv, Timepoint.first); + ResultObject.AddDateTimeTicks("time"sv, Timepoint.second); + ResultObject.EndObject(); + } + ResultObject.EndArray(); ResultObject.BeginArray("files"sv); for (const auto& File : Completed.OutputFiles) -- cgit v1.2.3