From 1d187340688615a01f28c8ecd99732492ee04c95 Mon Sep 17 00:00:00 2001 From: arkpar Date: Thu, 19 Jul 2018 15:12:26 +0200 Subject: [PATCH 1/2] Explicit disconnect on timeout --- substrate/network/src/protocol.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/network/src/protocol.rs b/substrate/network/src/protocol.rs index a9e09a36d1bc8..6bc20af5b86a0 100644 --- a/substrate/network/src/protocol.rs +++ b/substrate/network/src/protocol.rs @@ -393,7 +393,7 @@ impl> Protocol { self.specialization.write().maintain_peers(&mut ProtocolContext::new(&self.context_data, io)); for p in aborting { - self.on_peer_disconnected(io, p); + io.disconnect_peer(p); } } From c4684eecc873db2f04b5262933c1549774a4322f Mon Sep 17 00:00:00 2001 From: Gav Date: Thu, 19 Jul 2018 15:32:51 +0200 Subject: [PATCH 2/2] Fix telemetry --- substrate/telemetry/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/substrate/telemetry/src/lib.rs b/substrate/telemetry/src/lib.rs index dd5a30936d42c..62d16c1a81d7a 100644 --- a/substrate/telemetry/src/lib.rs +++ b/substrate/telemetry/src/lib.rs @@ -115,9 +115,11 @@ impl TelemetryWriter { }; drop(client); - if just_connected && !controlled_disconnect { + if just_connected { + if !controlled_disconnect { + info!("Reconnected to telemetry server: {}", self.config.url); + } self.last_time = Some(time::Instant::now()); - info!("Reconnected to telemetry server: {}", self.config.url); (self.config.on_connect)(); } }