aboutsummaryrefslogtreecommitdiff
path: root/zenserver
diff options
context:
space:
mode:
Diffstat (limited to 'zenserver')
-rw-r--r--zenserver/cache/structuredcache.cpp36
-rw-r--r--zenserver/casstore.cpp16
-rw-r--r--zenserver/compute/apply.cpp22
-rw-r--r--zenserver/diag/diagsvcs.h14
-rw-r--r--zenserver/projectstore.cpp86
-rw-r--r--zenserver/testing/httptest.cpp13
-rw-r--r--zenserver/testing/httptest.h7
-rw-r--r--zenserver/testing/launch.cpp6
8 files changed, 92 insertions, 108 deletions
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 57def07b9..a3e9c43e0 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -93,7 +93,7 @@ HttpStructuredCacheService::HandleRequest(zen::HttpServerRequest& Request)
return HandleCacheBucketRequest(Request, Key);
}
- return Request.WriteResponse(zen::HttpResponse::BadRequest); // invalid URL
+ return Request.WriteResponse(zen::HttpResponseCode::BadRequest); // invalid URL
}
if (Ref.PayloadId == IoHash::Zero)
@@ -128,11 +128,11 @@ HttpStructuredCacheService::HandleCacheBucketRequest(zen::HttpServerRequest& Req
if (m_CacheStore.DropBucket(Bucket))
{
- return Request.WriteResponse(zen::HttpResponse::OK);
+ return Request.WriteResponse(zen::HttpResponseCode::OK);
}
else
{
- return Request.WriteResponse(zen::HttpResponse::NotFound);
+ return Request.WriteResponse(zen::HttpResponseCode::NotFound);
}
break;
}
@@ -209,7 +209,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
{
m_Log.debug("MISS - '{}/{}'", Ref.BucketSegment, Ref.HashKey);
- return Request.WriteResponse(zen::HttpResponse::NotFound);
+ return Request.WriteResponse(zen::HttpResponseCode::NotFound);
}
if (Verb == kHead)
@@ -224,7 +224,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
Value.Value.GetContentType(),
InUpstreamCache ? "upstream" : "local");
- return Request.WriteResponse(zen::HttpResponse::OK, MapToHttpContentType(Value.Value.GetContentType()), Value.Value);
+ return Request.WriteResponse(zen::HttpResponseCode::OK, MapToHttpContentType(Value.Value.GetContentType()), Value.Value);
}
break;
@@ -234,7 +234,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
if (!Body || Body.Size() == 0)
{
- return Request.WriteResponse(zen::HttpResponse::BadRequest);
+ return Request.WriteResponse(zen::HttpResponseCode::BadRequest);
}
const HttpContentType ContentType = Request.RequestContentType();
@@ -253,7 +253,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
break;
default:
- return Request.WriteResponse(zen::HttpResponse::BadRequest);
+ return Request.WriteResponse(zen::HttpResponseCode::BadRequest);
}
if (!IsCompactBinary)
@@ -272,7 +272,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
{.Type = ZenContentType::kBinary, .CacheKey = {Ref.BucketSegment, Ref.HashKey}});
}
- return Request.WriteResponse(zen::HttpResponse::Created);
+ return Request.WriteResponse(zen::HttpResponseCode::Created);
}
// Validate payload before accessing it
@@ -284,7 +284,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
m_Log.warn("Payload for key '{}/{}' ({} bytes) failed validation", Ref.BucketSegment, Ref.HashKey, Body.Size());
// TODO: add details in response, kText || kCbObject?
- return Request.WriteResponse(HttpResponse::BadRequest, HttpContentType::kText, "Compact binary validation failed"sv);
+ return Request.WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, "Compact binary validation failed"sv);
}
// Extract referenced payload hashes
@@ -336,7 +336,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
.PayloadIds = std::move(References)});
}
- return Request.WriteResponse(zen::HttpResponse::Created);
+ return Request.WriteResponse(zen::HttpResponseCode::Created);
}
else
{
@@ -351,7 +351,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
Response.EndArray();
// Return Created | BadRequest?
- return Request.WriteResponse(zen::HttpResponse::Created, Response.Save());
+ return Request.WriteResponse(zen::HttpResponseCode::Created, Response.Save());
}
}
break;
@@ -407,7 +407,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
if (!Payload)
{
m_Log.debug("MISS - '{}/{}/{}'", Ref.BucketSegment, Ref.HashKey, Ref.PayloadId);
- return Request.WriteResponse(zen::HttpResponse::NotFound);
+ return Request.WriteResponse(zen::HttpResponseCode::NotFound);
}
m_Log.debug("HIT - '{}/{}/{}' ({} bytes, {}) ({})",
@@ -423,7 +423,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
Request.SetSuppressResponseBody();
}
- return Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kBinary, Payload);
+ return Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kBinary, Payload);
}
break;
@@ -433,7 +433,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
{
if (Body.Size() == 0)
{
- return Request.WriteResponse(zen::HttpResponse::BadRequest, HttpContentType::kText, "Empty payload not permitted");
+ return Request.WriteResponse(zen::HttpResponseCode::BadRequest, HttpContentType::kText, "Empty payload not permitted");
}
zen::IoHash ChunkHash = zen::IoHash::HashBuffer(Body);
@@ -443,7 +443,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
if (!Compressed)
{
// All attachment payloads need to be in compressed buffer format
- return Request.WriteResponse(zen::HttpResponse::BadRequest,
+ return Request.WriteResponse(zen::HttpResponseCode::BadRequest,
HttpContentType::kText,
"Attachments must be compressed");
}
@@ -452,7 +452,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
if (IoHash::FromBLAKE3(Compressed.GetRawHash()) != Ref.PayloadId)
{
// the URL specified content id and content hashes don't match!
- return Request.WriteResponse(HttpResponse::BadRequest);
+ return Request.WriteResponse(HttpResponseCode::BadRequest);
}
zen::CasStore::InsertResult Result = m_CasStore.InsertChunk(Body, ChunkHash);
@@ -469,11 +469,11 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
if (Result.New)
{
- return Request.WriteResponse(zen::HttpResponse::Created);
+ return Request.WriteResponse(zen::HttpResponseCode::Created);
}
else
{
- return Request.WriteResponse(zen::HttpResponse::OK);
+ return Request.WriteResponse(zen::HttpResponseCode::OK);
}
}
}
diff --git a/zenserver/casstore.cpp b/zenserver/casstore.cpp
index 1d147024a..6f1e4873b 100644
--- a/zenserver/casstore.cpp
+++ b/zenserver/casstore.cpp
@@ -23,7 +23,7 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store)
if ((EntryCount * sizeof(IoHash)) != Payload.Size())
{
- return ServerRequest.WriteResponse(HttpResponse::BadRequest);
+ return ServerRequest.WriteResponse(HttpResponseCode::BadRequest);
}
const IoHash* Hashes = reinterpret_cast<const IoHash*>(Payload.Data());
@@ -55,7 +55,7 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store)
Values[0] = IoBufferBuilder::MakeCloneFromMemory(HeaderStream.Data(), HeaderStream.Size());
- ServerRequest.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, Values);
+ ServerRequest.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, Values);
},
HttpVerb::kPost);
@@ -74,10 +74,10 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store)
{
if (IoBuffer Value = m_CasStore.FindChunk(Hash))
{
- return ServerRequest.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, Value);
+ return ServerRequest.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, Value);
}
- return ServerRequest.WriteResponse(HttpResponse::NotFound);
+ return ServerRequest.WriteResponse(HttpResponseCode::NotFound);
}
break;
@@ -89,12 +89,12 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store)
// URI hash must match content hash
if (PayloadHash != Hash)
{
- return ServerRequest.WriteResponse(HttpResponse::BadRequest);
+ return ServerRequest.WriteResponse(HttpResponseCode::BadRequest);
}
m_CasStore.InsertChunk(Payload, PayloadHash);
- return ServerRequest.WriteResponse(HttpResponse::OK);
+ return ServerRequest.WriteResponse(HttpResponseCode::OK);
}
break;
}
@@ -129,11 +129,11 @@ HttpCasService::HandleRequest(zen::HttpServerRequest& Request)
if (InsertResult.New)
{
- return Request.WriteResponse(HttpResponse::Created);
+ return Request.WriteResponse(HttpResponseCode::Created);
}
else
{
- return Request.WriteResponse(HttpResponse::OK);
+ return Request.WriteResponse(HttpResponseCode::OK);
}
}
break;
diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp
index 939ac3362..b46945d88 100644
--- a/zenserver/compute/apply.cpp
+++ b/zenserver/compute/apply.cpp
@@ -351,12 +351,12 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
if (auto It = m_WorkerMap.find(WorkerId); It == m_WorkerMap.end())
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
else
{
const WorkerDesc& Desc = It->second;
- return HttpReq.WriteResponse(HttpResponse::OK, Desc.Descriptor);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Desc.Descriptor);
}
}
break;
@@ -388,7 +388,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
spdlog::debug("worker {}: all attachments already available", WorkerId);
- return HttpReq.WriteResponse(HttpResponse::NoContent);
+ return HttpReq.WriteResponse(HttpResponseCode::NoContent);
}
else
{
@@ -406,7 +406,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
spdlog::debug("worker {}: need {} attachments", WorkerId, ChunkSet.GetChunkSet().size());
- return HttpReq.WriteResponse(HttpResponse::NotFound, ResponseWriter.Save());
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound, ResponseWriter.Save());
}
}
break;
@@ -456,7 +456,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
m_WorkerMap.insert_or_assign(WorkerId, WorkerDesc{.Descriptor = Obj});
- return HttpReq.WriteResponse(HttpResponse::NoContent);
+ return HttpReq.WriteResponse(HttpResponseCode::NoContent);
}
break;
}
@@ -495,7 +495,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
if (auto It = m_WorkerMap.find(WorkerId); It == m_WorkerMap.end())
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
else
{
@@ -538,7 +538,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
CbPackage Output = ExecAction(Worker, RequestObject);
- return HttpReq.WriteResponse(HttpResponse::OK, Output);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Output);
}
CbObjectWriter Cbo;
@@ -552,7 +552,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
Cbo.EndArray();
CbObject Response = Cbo.Save();
- return HttpReq.WriteResponse(HttpResponse::NotFound, Response);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound, Response);
}
break;
@@ -595,7 +595,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
CbPackage Output = ExecAction(Worker, ActionObj);
- return HttpReq.WriteResponse(HttpResponse::OK, Output);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Output);
}
break;
}
@@ -659,7 +659,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
if (!AllOk)
{
// TODO: Could report all the missing pieces in the response here
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
std::string Executable8{RequestObject["cmd"].AsString()};
@@ -681,7 +681,7 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
Response << "exitcode" << Job.ExitCode();
- return HttpReq.WriteResponse(HttpResponse::OK, Response.Save());
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
}
break;
}
diff --git a/zenserver/diag/diagsvcs.h b/zenserver/diag/diagsvcs.h
index 82b7bdf15..51ee98f67 100644
--- a/zenserver/diag/diagsvcs.h
+++ b/zenserver/diag/diagsvcs.h
@@ -25,17 +25,17 @@ public:
if (Uri == "hello"sv)
{
- Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kText, u8"hello world!"sv);
+ Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kText, u8"hello world!"sv);
// OutputLogMessageInternal(&LogPoint, 0, 0);
}
else if (Uri == "1K"sv)
{
- Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kBinary, m_1k);
+ Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kBinary, m_1k);
}
else if (Uri == "1M"sv)
{
- Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kBinary, m_1m);
+ Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kBinary, m_1m);
}
else if (Uri == "1M_1k"sv)
{
@@ -47,7 +47,7 @@ public:
Buffers.push_back(m_1k);
}
- Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kBinary, Buffers);
+ Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kBinary, Buffers);
}
else if (Uri == "1G"sv)
{
@@ -59,7 +59,7 @@ public:
Buffers.push_back(m_1m);
}
- Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kBinary, Buffers);
+ Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kBinary, Buffers);
}
else if (Uri == "1G_1k"sv)
{
@@ -71,7 +71,7 @@ public:
Buffers.push_back(m_1k);
}
- Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kBinary, Buffers);
+ Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kBinary, Buffers);
}
}
@@ -95,7 +95,7 @@ public:
switch (Request.RequestVerb())
{
case zen::HttpVerb::kGet:
- return Request.WriteResponse(zen::HttpResponse::OK, zen::HttpContentType::kText, u8"OK!"sv);
+ return Request.WriteResponse(zen::HttpResponseCode::OK, zen::HttpContentType::kText, u8"OK!"sv);
}
}
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index d49fb616e..ffed50e9a 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -909,7 +909,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
// Parse Request
@@ -940,7 +940,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (Payload.Size() <= sizeof(RequestHeader))
{
- HttpReq.WriteResponse(HttpResponse::BadRequest);
+ HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
RequestHeader RequestHdr;
@@ -948,7 +948,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (RequestHdr.Magic != RequestHeader::kMagic)
{
- HttpReq.WriteResponse(HttpResponse::BadRequest);
+ HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
std::vector<RequestChunkEntry> RequestedChunks;
@@ -1020,7 +1020,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
ResponsePtr += sizeof(ResponseChunk);
}
- return HttpReq.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, OutBlobs);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, OutBlobs);
},
HttpVerb::kPost);
@@ -1038,7 +1038,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
ProjectStore::Oplog& Log = *FoundLog;
@@ -1063,7 +1063,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
Response.EndArray();
- return HttpReq.WriteResponse(HttpResponse::OK, Response.Save());
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
},
HttpVerb::kGet);
@@ -1080,7 +1080,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
ProjectStore::Oplog& Log = *FoundLog;
@@ -1093,10 +1093,10 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
{
CbObjectWriter Response;
Response << "size" << Value.Size();
- return HttpReq.WriteResponse(HttpResponse::OK, Response.Save());
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
}
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
},
HttpVerb::kGet);
@@ -1124,7 +1124,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
}
else
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest);
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
}
@@ -1137,7 +1137,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
}
else
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest);
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
}
@@ -1147,7 +1147,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
ProjectStore::Oplog& Log = *FoundLog;
@@ -1162,7 +1162,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
case HttpVerb::kGet:
if (!Value)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
if (Verb == HttpVerb::kHead)
@@ -1185,10 +1185,10 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
// Send only a subset of data
IoBuffer InnerValue(Value, Offset, Size);
- return HttpReq.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, InnerValue);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, InnerValue);
}
- return HttpReq.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, Value);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, Value);
}
},
HttpVerb::kGet | HttpVerb::kHead);
@@ -1217,7 +1217,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
}
else
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest);
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
}
@@ -1230,7 +1230,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
}
else
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest);
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
}
@@ -1240,7 +1240,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
IoBuffer Value = m_CasStore.FindChunk(Hash);
if (!Value)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
if (IsOffset)
@@ -1258,10 +1258,10 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
// Send only a subset of data
IoBuffer InnerValue(Value, Offset, Size);
- return HttpReq.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, InnerValue);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, InnerValue);
}
- return HttpReq.WriteResponse(HttpResponse::OK, HttpContentType::kBinary, Value);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, Value);
},
HttpVerb::kGet);
@@ -1277,7 +1277,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
// This operation takes a list of referenced hashes and decides which
@@ -1312,7 +1312,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
Cbo.EndArray();
CbObject Response = Cbo.Save();
- return HttpReq.WriteResponse(HttpResponse::OK, Response);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response);
},
HttpVerb::kPost);
@@ -1340,7 +1340,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
ProjectStore::Oplog& Log = *FoundLog;
@@ -1389,21 +1389,21 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
CbPackage Package;
if (!Package.TryLoad(Payload, &UniqueBuffer::Alloc, &Resolver))
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest, HttpContentType::kText, "Invalid package");
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, "Invalid package");
}
if (!IsValid)
{
// TODO: emit diagnostics identifying missing chunks
- return HttpReq.WriteResponse(HttpResponse::NotFound, HttpContentType::kText, "Missing chunk reference");
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, "Missing chunk reference");
}
CbObject Core = Package.GetObject();
if (!Core["key"sv])
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest, HttpContentType::kText, "No oplog entry key specified");
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, "No oplog entry key specified");
}
// Write core to oplog
@@ -1412,12 +1412,12 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (OpLsn == ProjectStore::Oplog::kInvalidOp)
{
- return HttpReq.WriteResponse(HttpResponse::BadRequest);
+ return HttpReq.WriteResponse(HttpResponseCode::BadRequest);
}
m_Log.info("new op #{:4} - {}/{} ({:>6}) {}", OpLsn, ProjectId, OplogId, NiceBytes(Payload.Size()), Core["key"sv].AsString());
- HttpReq.WriteResponse(HttpResponse::Created);
+ HttpReq.WriteResponse(HttpResponseCode::Created);
},
HttpVerb::kPost);
@@ -1428,7 +1428,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
// TODO: look up op and respond with the payload!
- HttpReq.WriteResponse(HttpResponse::Accepted, HttpContentType::kText, u8"yeee"sv);
+ HttpReq.WriteResponse(HttpResponseCode::Accepted, HttpContentType::kText, u8"yeee"sv);
},
HttpVerb::kGet);
@@ -1444,7 +1444,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (!ProjectIt)
{
- return Req.ServerRequest().WriteResponse(HttpResponse::NotFound,
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound,
HttpContentType::kText,
"project {} not found"_format(ProjectId));
}
@@ -1459,7 +1459,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (!OplogIt)
{
- return Req.ServerRequest().WriteResponse(HttpResponse::NotFound,
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound,
HttpContentType::kText,
"oplog {} not found in project {}"_format(OplogId, ProjectId));
}
@@ -1469,7 +1469,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
CbObjectWriter Cb;
Cb << "id"sv << Log.OplogId() << "project"sv << Prj.Identifier << "tempdir"sv << Log.TempDir();
- Req.ServerRequest().WriteResponse(HttpResponse::OK, Cb.Save());
+ Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Cb.Save());
}
break;
@@ -1482,18 +1482,18 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (!Prj.NewOplog(OplogId))
{
// TODO: indicate why the operation failed!
- return Req.ServerRequest().WriteResponse(HttpResponse::InternalServerError);
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::InternalServerError);
}
m_Log.info("established oplog {} / {}", ProjectId, OplogId);
- return Req.ServerRequest().WriteResponse(HttpResponse::Created);
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::Created);
}
// I guess this should ultimately be used to execute RPCs but for now, it
// does absolutely nothing
- return Req.ServerRequest().WriteResponse(HttpResponse::BadRequest);
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
}
break;
@@ -1503,7 +1503,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
ProjectIt->DeleteOplog(OplogId);
- return Req.ServerRequest().WriteResponse(HttpResponse::OK);
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::OK);
}
break;
}
@@ -1522,7 +1522,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (FoundLog == nullptr)
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
CbObjectWriter Response;
@@ -1542,7 +1542,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
}
else
{
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
}
else
@@ -1555,7 +1555,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
}
}
- return HttpReq.WriteResponse(HttpResponse::OK, Response.Save());
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
},
HttpVerb::kGet);
@@ -1585,7 +1585,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
EngineRoot,
ProjectRoot);
- Req.ServerRequest().WriteResponse(HttpResponse::Created);
+ Req.ServerRequest().WriteResponse(HttpResponseCode::Created);
}
break;
@@ -1595,7 +1595,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (!ProjectIt)
{
- return Req.ServerRequest().WriteResponse(HttpResponse::NotFound,
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound,
HttpContentType::kText,
"project {} not found"_format(ProjectId));
}
@@ -1609,7 +1609,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
Prj.IterateOplogs([&](const ProjectStore::Oplog& I) { Response << "id"sv << I.OplogId(); });
Response.EndArray(); // oplogs
- Req.ServerRequest().WriteResponse(HttpResponse::OK, Response.Save());
+ Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Response.Save());
}
break;
@@ -1619,7 +1619,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
if (!ProjectIt)
{
- return Req.ServerRequest().WriteResponse(HttpResponse::NotFound,
+ return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound,
HttpContentType::kText,
"project {} not found"_format(ProjectId));
}
diff --git a/zenserver/testing/httptest.cpp b/zenserver/testing/httptest.cpp
index 0639c2b53..653f76046 100644
--- a/zenserver/testing/httptest.cpp
+++ b/zenserver/testing/httptest.cpp
@@ -8,18 +8,16 @@ HttpTestingService::HttpTestingService()
{
m_Router.RegisterRoute(
"hello",
- [this](HttpRouterRequest& Req) { Req.ServerRequest().WriteResponse(HttpResponse::OK); },
+ [this](HttpRouterRequest& Req) { Req.ServerRequest().WriteResponse(HttpResponseCode::OK); },
HttpVerb::kGet);
m_Router.RegisterRoute(
"echo",
[this](HttpRouterRequest& Req) {
IoBuffer Body = Req.ServerRequest().ReadPayload();
- Req.ServerRequest().WriteResponse(HttpResponse::OK, HttpContentType::kBinary, Body);
+ Req.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, Body);
},
HttpVerb::kPost);
-
- m_Router.RegisterRoute("package", m_PackageHandler);
}
HttpTestingService::~HttpTestingService()
@@ -38,11 +36,4 @@ HttpTestingService::HandleRequest(HttpServerRequest& Request)
m_Router.HandleRequest(Request);
}
-void
-HttpTestingService::PackageHandler::HandleRequest(HttpRouterRequest& Req)
-{
- IoBuffer Body = Req.ServerRequest().ReadPayload();
- Req.ServerRequest().WriteResponse(HttpResponse::OK, HttpContentType::kBinary, Body);
-}
-
} // namespace zen
diff --git a/zenserver/testing/httptest.h b/zenserver/testing/httptest.h
index 696543616..18652db71 100644
--- a/zenserver/testing/httptest.h
+++ b/zenserver/testing/httptest.h
@@ -22,13 +22,6 @@ public:
private:
HttpRequestRouter m_Router;
-
- struct PackageHandler : public PackageEndpointHandler
- {
- virtual void HandleRequest(HttpRouterRequest& Request) override;
- };
-
- PackageHandler m_PackageHandler;
};
} // namespace zen
diff --git a/zenserver/testing/launch.cpp b/zenserver/testing/launch.cpp
index d06fae3e2..b031193d5 100644
--- a/zenserver/testing/launch.cpp
+++ b/zenserver/testing/launch.cpp
@@ -409,7 +409,7 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat
Cbo.EndArray();
CbObject Response = Cbo.Save();
- return HttpReq.WriteResponse(HttpResponse::OK, Response);
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response);
}
break;
}
@@ -470,7 +470,7 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat
if (!AllOk)
{
// TODO: Could report all the missing pieces in the response here
- return HttpReq.WriteResponse(HttpResponse::NotFound);
+ return HttpReq.WriteResponse(HttpResponseCode::NotFound);
}
std::string Executable8{RequestObject["cmd"].AsString()};
@@ -492,7 +492,7 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat
Response << "exitcode" << Job.ExitCode();
- return HttpReq.WriteResponse(HttpResponse::OK, Response.Save());
+ return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
}
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-23 00:17:30 +0000