diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs index 48d39af4..ed322ccc 100644 --- a/veilid-core/src/rpc_processor/mod.rs +++ b/veilid-core/src/rpc_processor/mod.rs @@ -599,6 +599,7 @@ impl RPCProcessor { waitable_reply: WaitableReply, debug_string: String, ) -> Result, RPCError> { + let id = waitable_reply.handle.id(); let out = self .unlocked_inner .waiting_rpc_table @@ -606,7 +607,7 @@ impl RPCProcessor { .await; match &out { Err(e) => { - log_rpc!(debug "RPC Lost ({}): {}", debug_string, e); + log_rpc!(debug "RPC Lost (id={} {}): {}", id, debug_string, e); self.record_question_lost( waitable_reply.send_ts, waitable_reply.node_ref.clone(), @@ -616,7 +617,7 @@ impl RPCProcessor { ); } Ok(TimeoutOr::Timeout) => { - log_rpc!(debug "RPC Lost ({}): Timeout", debug_string); + log_rpc!(debug "RPC Lost (id={} {}): Timeout", id, debug_string); self.record_question_lost( waitable_reply.send_ts, waitable_reply.node_ref.clone(), diff --git a/veilid-core/src/rpc_processor/operation_waiter.rs b/veilid-core/src/rpc_processor/operation_waiter.rs index 77dce482..ae6c2f80 100644 --- a/veilid-core/src/rpc_processor/operation_waiter.rs +++ b/veilid-core/src/rpc_processor/operation_waiter.rs @@ -11,6 +11,16 @@ where result_receiver: Option>, } +impl OperationWaitHandle +where + T: Unpin, + C: Unpin + Clone, +{ + pub fn id(&self) -> OperationId { + self.op_id + } +} + impl Drop for OperationWaitHandle where T: Unpin,