call on_disconnect in more situations so we can properly handle dead …

…sockets

src/dpp/discordclient.cpp

@@ -133,7 +133,9 @@ discord_client::~discord_client()
 void discord_client::on_disconnect()
 {
 	set_resume_hostname();
-	log(dpp::ll_debug, "Lost connection to websocket on shard " + std::to_string(shard_id) + ", reconnecting...");
+	if (sfd != INVALID_SOCKET) {
+		log(dpp::ll_debug, "Lost connection to websocket on shard " + std::to_string(shard_id) + ", reconnecting...");
+	}
 	ssl_client::close();
 	owner->add_reconnect(this->shard_id);
 }

src/dpp/wsclient.cpp

@@ -320,15 +320,15 @@ void websocket_client::one_second_timer()
 	/* Handle timeouts for connect(), SSL negotiation and HTTP negotiation */
 	if (!timed_out && sfd != INVALID_SOCKET) {
 		if (!tcp_connect_done && now >= timeout) {
-			log(ll_warning, "Websocket connection timed out: connect()");
+			log(ll_trace, "Websocket connection timed out: connect()");
 			timed_out = true;
 			this->close();
 		} else if (tcp_connect_done && !connected && now >= timeout && this->state != CONNECTED) {
-			log(ll_warning, "Websocket connection timed out: SSL handshake");
+			log(ll_trace, "Websocket connection timed out: SSL handshake");
 			timed_out = true;
 			this->close();
 		} else if (now >= timeout && this->state != CONNECTED) {
-			log(ll_warning, "Websocket connection timed out: HTTP negotiation");
+			log(ll_trace, "Websocket connection timed out: HTTP negotiation");
 			timed_out = true;
 			this->close();
 		}
@@ -370,9 +370,7 @@ void websocket_client::on_disconnect()
 
 void websocket_client::close()
 {
-	if (sfd != INVALID_SOCKET) {
-		this->on_disconnect();
-	}
+	this->on_disconnect();
 	this->state = HTTP_HEADERS;
 	ssl_client::close();
 }