From d8acd4a1ebf7df5a7b9e7b812abe3163741c3d93 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Fri, 22 Jun 2018 18:26:22 +0200 Subject: [PATCH] Fix telemetry (#231) * Fix telemetry * Correct default telemetry * Extra logging --- substrate/polkadot/cli/src/lib.rs | 2 +- substrate/substrate/telemetry/src/lib.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/substrate/polkadot/cli/src/lib.rs b/substrate/polkadot/cli/src/lib.rs index 96d38cb2e5..d70b0cff9c 100644 --- a/substrate/polkadot/cli/src/lib.rs +++ b/substrate/polkadot/cli/src/lib.rs @@ -84,7 +84,7 @@ use futures::sync::mpsc; use futures::{Sink, Future, Stream}; use tokio_core::reactor; -const DEFAULT_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io:443"; +const DEFAULT_TELEMETRY_URL: &str = "ws://telemetry.polkadot.io:1024"; #[derive(Clone)] struct SystemConfiguration { diff --git a/substrate/substrate/telemetry/src/lib.rs b/substrate/substrate/telemetry/src/lib.rs index 2ed4143bd7..335a93ee68 100644 --- a/substrate/substrate/telemetry/src/lib.rs +++ b/substrate/substrate/telemetry/src/lib.rs @@ -25,6 +25,8 @@ extern crate parking_lot; extern crate websocket as ws; extern crate slog_async; extern crate slog_json; +#[macro_use] +extern crate log; #[macro_use(o, kv)] extern crate slog; extern crate slog_scope; @@ -77,6 +79,7 @@ struct TelemetryWriter { impl TelemetryWriter { fn ensure_connected(&mut self) { if self.first_time { + info!("Connected to telemetry server: {}", self.config.url); (self.config.on_connect)(); self.first_time = false; } @@ -105,7 +108,7 @@ impl io::Write for TelemetryWriter { let mut l = self.out.lock(); let socket_closed = if let Some(ref mut socket) = *l { if let Ok(s) = ::std::str::from_utf8(&self.buffer[..]) { - socket.send_message(&ws::Message::text(s)).is_ok() + socket.send_message(&ws::Message::text(s)).is_err() } else { false } } else { false }; if socket_closed {