Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions crates/core/src/client_events/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1155,34 +1155,37 @@ async fn process_open_request(
tracing::debug!(
peer_id = %peer_id,
key = %key,
"Starting direct SUBSCRIBE operation (legacy mode)",
"Starting direct SUBSCRIBE operation",
);

// Legacy mode: direct operation without deduplication
let op_id =
crate::node::subscribe(op_manager.clone(), key, Some(client_id))
.await
.inspect_err(|err| {
tracing::error!("Subscribe error: {}", err);
})?;

tracing::debug!(
request_id = %request_id,
transaction_id = %op_id,
operation = "subscribe",
"Request-Transaction correlation"
);
// Generate transaction, register first, then run op
let tx = crate::message::Transaction::new::<
crate::operations::subscribe::SubscribeMsg,
>();

op_manager
.ch_outbound
.waiting_for_transaction_result(op_id, client_id, request_id)
.waiting_for_transaction_result(tx, client_id, request_id)
.await
.inspect_err(|err| {
tracing::error!(
"Error waiting for transaction result: {}",
err
);
})?;

crate::node::subscribe_with_id(op_manager.clone(), key, None, Some(tx))
.await
.inspect_err(|err| {
tracing::error!("Subscribe error: {}", err);
})?;

tracing::debug!(
request_id = %request_id,
transaction_id = %tx,
operation = "subscribe",
"Request-Transaction correlation"
);
}
}
_ => {
Expand Down
Loading
Loading