Fully propagate context to ExtractionRequest

ecmwf · Sep 18, 2024 · d4ba56e · d4ba56e
1 parent 4df90eb
commit d4ba56e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/gribjump/remote/GribJumpUser.cc b/src/gribjump/remote/GribJumpUser.cc
@@ -119,7 +119,7 @@ void GribJumpUser::extract(eckit::Stream& s, eckit::Timer& timer) {
 
     LogContext ctx(s);
 
-    ExtractRequest request(s);
+    ExtractRequest request(s, ctx);
 
     timer.reset("EXTRACT requests received");
 

diff --git a/src/gribjump/remote/RemoteGribJump.cc b/src/gribjump/remote/RemoteGribJump.cc
@@ -92,8 +92,8 @@ std::vector<std::vector<ExtractionResult*>> RemoteGribJump::extract(std::vector<
     eckit::net::InstantTCPStream stream(client.connect(host_, port_));
     timer.report("Connection established");
 
-
     stream << "EXTRACT";
+
     stream << ctx;
 
     size_t nRequests = requests.size();
@@ -187,4 +187,4 @@ bool RemoteGribJump::receiveErrors(eckit::Stream& stream, bool raise) {
 
 static GribJumpBuilder<RemoteGribJump> builder("remote");
 
-} // namespace gribjump
+} // namespace gribjump
diff --git a/src/gribjump/remote/Request.cc b/src/gribjump/remote/Request.cc
@@ -59,7 +59,8 @@ void ScanRequest::replyToClient() {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-ExtractRequest::ExtractRequest(eckit::Stream& stream) : Request(stream) {
+
+ExtractRequest::ExtractRequest(eckit::Stream& stream, LogContext ctx) : Request(stream, ctx) {
 
     // Receive the requests
     // Temp, repackage the requests from old format into format the engine expects

diff --git a/src/gribjump/remote/Request.h b/src/gribjump/remote/Request.h
@@ -81,7 +81,7 @@ class ScanRequest : public Request {
 class ExtractRequest : public Request {
 public:
 
-    ExtractRequest(eckit::Stream& stream);
+    ExtractRequest(eckit::Stream& stream, LogContext ctx);
 
     ~ExtractRequest();