wip2

1 files changed, 21 insertions, 28 deletions

diff --git a/src/zenserver/storage/projectstore/httpprojectstore.cpp b/src/zenserver/storage/projectstore/httpprojectstore.cpp
index 8c34e09d7..99dc5717d 100644
--- a/src/zenserver/storage/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/storage/projectstore/httpprojectstore.cpp
@@ -2869,34 +2869,27 @@ HttpProjectService::HandleRpcRequest(HttpRouterRequest& Req)
 
 						try
 						{
-							RemoteProjectStore::Result Result	= LoadOplog(LoadOplogContext{
-								  .ChunkStore	 = m_CidStore,
-								  .RemoteStore	 = *RemoteStoreResult->Store,
-								  .OptionalCache = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->Cache.get() : nullptr,
-								  .CacheBuildId	 = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->BuildsId : Oid::Zero,
-								  .OptionalCacheStats = RemoteStoreResult->OptionalCache ? &RemoteStoreResult->OptionalCache->Stats : nullptr,
-								  .Oplog			  = *Oplog,
-								  .NetworkWorkerPool  = NetworkWorkerPool,
-								  .WorkerPool		  = WorkerPool,
-								  .ForceDownload	  = Force,
-								  .IgnoreMissingAttachments = IgnoreMissingAttachments,
-								  .CleanOplog				= CleanOplog,
-								  .PartialBlockRequestMode	= PartialBlockRequestMode,
-								  .PopulateCache   = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->Populate : false,
-								  .StoreLatencySec = RemoteStoreResult->LatencySec,
-								  .StoreMaxRangeCountPerRequest = RemoteStoreResult->MaxRangeCountPerRequest,
-								  .CacheLatencySec = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->LatencySec : -1.0,
-								  .CacheMaxRangeCountPerRequest =
-									  RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->MaxRangeCountPerRequest : 0,
-								  .OptionalJobContext = &Context});
-							auto					   Response = ConvertResult(Result);
-							ZEN_INFO("LoadOplog: Status: {} '{}'", ToString(Response.first), Response.second);
-							if (!IsHttpSuccessCode(Response.first))
-							{
-								throw JobError(
-									Response.second.empty() ? fmt::format("Status: {}", ToString(Response.first)) : Response.second,
-									(int)Response.first);
-							}
+							LoadOplog(LoadOplogContext{
+								.ChunkStore	   = m_CidStore,
+								.RemoteStore   = *RemoteStoreResult->Store,
+								.OptionalCache = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->Cache.get() : nullptr,
+								.CacheBuildId  = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->BuildsId : Oid::Zero,
+								.OptionalCacheStats = RemoteStoreResult->OptionalCache ? &RemoteStoreResult->OptionalCache->Stats : nullptr,
+								.Oplog				= *Oplog,
+								.NetworkWorkerPool	= NetworkWorkerPool,
+								.WorkerPool			= WorkerPool,
+								.ForceDownload		= Force,
+								.IgnoreMissingAttachments = IgnoreMissingAttachments,
+								.CleanOplog				  = CleanOplog,
+								.PartialBlockRequestMode  = PartialBlockRequestMode,
+								.PopulateCache	 = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->Populate : false,
+								.StoreLatencySec = RemoteStoreResult->LatencySec,
+								.StoreMaxRangeCountPerRequest = RemoteStoreResult->MaxRangeCountPerRequest,
+								.CacheLatencySec = RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->LatencySec : -1.0,
+								.CacheMaxRangeCountPerRequest =
+									RemoteStoreResult->OptionalCache ? RemoteStoreResult->OptionalCache->MaxRangeCountPerRequest : 0,
+								.OptionalJobContext = &Context});
+							ZEN_INFO("LoadOplog: Complete");
 						}
 						catch (const HttpClientError& HttpEx)
 						{