From d72f9cf0e3ab1095b489eeddafa8e614fa462b65 Mon Sep 17 00:00:00 2001 From: Austin Hellyer Date: Wed, 1 Feb 2017 14:00:59 -0800 Subject: Log only unexpected keepalive errors --- src/client/gateway/prep.rs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/client/gateway/prep.rs b/src/client/gateway/prep.rs index 10f00ce..15716df 100644 --- a/src/client/gateway/prep.rs +++ b/src/client/gateway/prep.rs @@ -13,6 +13,7 @@ use super::{GatewayError, GatewayStatus}; use time::{self, Duration}; use websocket::client::request::Url as RequestUrl; use websocket::client::{Receiver, Sender}; +use websocket::result::WebSocketError as WsError; use websocket::stream::WebSocketStream; use ::constants::{self, LARGE_THRESHOLD, OpCode}; use ::error::{Error, Result}; @@ -138,7 +139,14 @@ pub fn keepalive(interval: u64, *heartbeat_sent.lock().unwrap() = now; }, Err(why) => { - warn!("Error sending keepalive: {:?}", why); + match why { + Error::WebSocket(WsError::IoError(err)) => { + if err.raw_os_error() != Some(32) { + debug!("Err w/ keepalive: {:?}", err); + } + }, + other => warn!("Other err w/ keepalive: {:?}", other), + } if last_successful { debug!("If next keepalive fails, closing"); @@ -156,6 +164,11 @@ pub fn keepalive(interval: u64, match sender.shutdown_all() { Ok(_) => debug!("Successfully shutdown sender/receiver"), - Err(why) => warn!("Failed to shutdown sender/receiver: {:?}", why), + Err(why) => { + // This can fail if the receiver already shutdown. + if why.raw_os_error() != Some(107) { + warn!("Failed to shutdown sender/receiver: {:?}", why); + } + }, } } -- cgit v1.2.3