Skip to content

Commit

Permalink
Merge branch 'stable2412' into backport-6562-to-stable2412
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorPopelyaev authored Dec 3, 2024
2 parents 4753397 + dbfe304 commit d4e74cb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
14 changes: 14 additions & 0 deletions prdoc/pr_6588.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json

title: "rpc server: fix subscription id_provider being reset to default one"

doc:
- audience: Node Dev
description: |
The modification ensures that the id_provider variable is cloned instead of taken, which can help prevent issues related id provider being reset to the default.


crates:
- name: sc-rpc-server
bump: patch
7 changes: 3 additions & 4 deletions substrate/client/rpc-servers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ where
local_addrs.push(local_addr);
let cfg = cfg.clone();

let mut id_provider2 = id_provider.clone();
let id_provider2 = id_provider.clone();

tokio_handle.spawn(async move {
loop {
Expand Down Expand Up @@ -197,10 +197,9 @@ where
.set_http_middleware(http_middleware)
.set_message_buffer_capacity(max_buffer_capacity_per_connection)
.set_batch_request_config(batch_config)
.custom_tokio_runtime(cfg.tokio_handle.clone())
.set_id_provider(RandomStringIdProvider::new(16));
.custom_tokio_runtime(cfg.tokio_handle.clone());

if let Some(provider) = id_provider2.take() {
if let Some(provider) = id_provider2.clone() {
builder = builder.set_id_provider(provider);
} else {
builder = builder.set_id_provider(RandomStringIdProvider::new(16));
Expand Down

0 comments on commit d4e74cb

Please sign in to comment.