single thread async cache log (#361)

* rework cache store background jogging
* correct capture for context

1 files changed, 50 insertions, 50 deletions

diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp
index 0120f3599..51d3d94d8 100644
--- a/src/zenserver/cache/httpstructuredcache.cpp
+++ b/src/zenserver/cache/httpstructuredcache.cpp
@@ -1703,63 +1703,63 @@ HttpStructuredCacheService::HandleRpcRequest(HttpServerRequest& Request)
 					return Request.WriteResponse(HttpResponseCode::BadRequest);
 				}
 
-				Request.WriteResponseAsync([this, &RequestContext, Body = Request.ReadPayload(), ContentType, AcceptType](
-											   HttpServerRequest& AsyncRequest) mutable {
-					std::uint64_t RequestIndex =
-						m_RequestRecorder ? m_RequestRecorder->RecordRequest(ContentType, AcceptType, Body) : ~0ull;
-					uint32_t		 AcceptMagic	 = 0;
-					RpcAcceptOptions AcceptFlags	 = RpcAcceptOptions::kNone;
-					int				 TargetProcessId = 0;
-					CbPackage		 RpcResult;
-
-					HttpResponseCode ResultCode = HandleRpcRequest(RequestContext,
-																   ContentType,
-																   std::move(Body),
-																   AcceptMagic,
-																   AcceptFlags,
-																   TargetProcessId,
-																   RpcResult);
-					if (!IsHttpSuccessCode(ResultCode))
-					{
-						AsyncRequest.WriteResponse(ResultCode);
-						return;
-					}
-					if (AcceptMagic == kCbPkgMagic)
-					{
-						FormatFlags Flags = FormatFlags::kDefault;
-						if (EnumHasAllFlags(AcceptFlags, RpcAcceptOptions::kAllowLocalReferences))
+				Request.WriteResponseAsync(
+					[this, RequestContext, Body = Request.ReadPayload(), ContentType, AcceptType](HttpServerRequest& AsyncRequest) mutable {
+						std::uint64_t RequestIndex =
+							m_RequestRecorder ? m_RequestRecorder->RecordRequest(ContentType, AcceptType, Body) : ~0ull;
+						uint32_t		 AcceptMagic	 = 0;
+						RpcAcceptOptions AcceptFlags	 = RpcAcceptOptions::kNone;
+						int				 TargetProcessId = 0;
+						CbPackage		 RpcResult;
+
+						HttpResponseCode ResultCode = HandleRpcRequest(RequestContext,
+																	   ContentType,
+																	   std::move(Body),
+																	   AcceptMagic,
+																	   AcceptFlags,
+																	   TargetProcessId,
+																	   RpcResult);
+						if (!IsHttpSuccessCode(ResultCode))
 						{
-							Flags |= FormatFlags::kAllowLocalReferences;
-							if (!EnumHasAnyFlags(AcceptFlags, RpcAcceptOptions::kAllowPartialLocalReferences))
+							AsyncRequest.WriteResponse(ResultCode);
+							return;
+						}
+						if (AcceptMagic == kCbPkgMagic)
+						{
+							FormatFlags Flags = FormatFlags::kDefault;
+							if (EnumHasAllFlags(AcceptFlags, RpcAcceptOptions::kAllowLocalReferences))
 							{
-								Flags |= FormatFlags::kDenyPartialLocalReferences;
+								Flags |= FormatFlags::kAllowLocalReferences;
+								if (!EnumHasAnyFlags(AcceptFlags, RpcAcceptOptions::kAllowPartialLocalReferences))
+								{
+									Flags |= FormatFlags::kDenyPartialLocalReferences;
+								}
 							}
+							CompositeBuffer RpcResponseBuffer = FormatPackageMessageBuffer(RpcResult, Flags, TargetProcessId);
+							if (RequestIndex != ~0ull)
+							{
+								ZEN_ASSERT(m_RequestRecorder);
+								m_RequestRecorder->RecordResponse(RequestIndex, HttpContentType::kCbPackage, RpcResponseBuffer);
+							}
+							AsyncRequest.WriteResponse(HttpResponseCode::OK, HttpContentType::kCbPackage, RpcResponseBuffer);
 						}
-						CompositeBuffer RpcResponseBuffer = FormatPackageMessageBuffer(RpcResult, Flags, TargetProcessId);
-						if (RequestIndex != ~0ull)
+						else
 						{
-							ZEN_ASSERT(m_RequestRecorder);
-							m_RequestRecorder->RecordResponse(RequestIndex, HttpContentType::kCbPackage, RpcResponseBuffer);
-						}
-						AsyncRequest.WriteResponse(HttpResponseCode::OK, HttpContentType::kCbPackage, RpcResponseBuffer);
-					}
-					else
-					{
-						BinaryWriter MemStream;
-						RpcResult.Save(MemStream);
+							BinaryWriter MemStream;
+							RpcResult.Save(MemStream);
 
-						if (RequestIndex != ~0ull)
-						{
-							ZEN_ASSERT(m_RequestRecorder);
-							m_RequestRecorder->RecordResponse(RequestIndex,
-															  HttpContentType::kCbPackage,
-															  IoBuffer(IoBuffer::Wrap, MemStream.GetData(), MemStream.GetSize()));
+							if (RequestIndex != ~0ull)
+							{
+								ZEN_ASSERT(m_RequestRecorder);
+								m_RequestRecorder->RecordResponse(RequestIndex,
+																  HttpContentType::kCbPackage,
+																  IoBuffer(IoBuffer::Wrap, MemStream.GetData(), MemStream.GetSize()));
+							}
+							AsyncRequest.WriteResponse(HttpResponseCode::OK,
+													   HttpContentType::kCbPackage,
+													   IoBuffer(IoBuffer::Wrap, MemStream.GetData(), MemStream.GetSize()));
 						}
-						AsyncRequest.WriteResponse(HttpResponseCode::OK,
-												   HttpContentType::kCbPackage,
-												   IoBuffer(IoBuffer::Wrap, MemStream.GetData(), MemStream.GetSize()));
-					}
-				});
+					});
 			}
 			break;
 		default: