libtransport.git Changeset - f592dc0ef3a6

Changeset - f592dc0ef3a6

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 10 years ago 2015-12-28 09:17:41
jkaluza@redhat.com

Reconnect to Slack RTM when disconnected with an error

2 files changed with 11 insertions and 0 deletions:

include/transport/WebSocketClient.h

libtransport/WebSocketClient.cpp

0 comments (0 inline, 0 general)

include/transport/WebSocketClient.h

➞

Show inline comments

@@ @@ -57,24 +57,25 @@ class WebSocketClient { @@
 		void connectServer(const std::string &u);
 		void write(const std::string &data);
 		boost::signal<void (const std::string &payload)> onPayloadReceived;
 		boost::signal<void ()> onWebSocketConnected;
 	private:
 		void handleDNSResult(const std::vector<Swift::HostAddress>&, boost::optional<Swift::DomainNameResolveError>);
 		void handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data);
 		void handleConnected(bool error);
 		void handleDisconnected(const boost::optional<Swift::Connection::Error> &error);
 		void connectServer();
 	private:
 		Component *m_component;
 		boost::shared_ptr<Swift::DomainNameAddressQuery> m_dnsQuery;
 		boost::shared_ptr<Swift::Connection> m_conn;
 		Swift::TLSConnectionFactory *m_tlsConnectionFactory;
 		Swift::PlatformTLSFactories *m_tlsFactory;
 		std::string m_host;
 		std::string m_path;
 		std::string m_buffer;

libtransport/WebSocketClient.cpp

➞

Show inline comments

@@ @@ -199,20 +199,30 @@ void WebSocketClient::handleConnected(bool error) { @@
 	std::string req = "";
 	req += "GET " + m_path + " HTTP/1.1\r\n";
 	req += "Host: " + m_host + ":443\r\n";
 	req += "Upgrade: websocket\r\n";
 	req += "Connection: Upgrade\r\n";
 	req += "Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n";
 	req += "Sec-WebSocket-Version: 13\r\n";
 	req += "\r\n";
 	m_conn->write(Swift::createSafeByteArray(req));
+}
 void WebSocketClient::handleDisconnected(const boost::optional<Swift::Connection::Error> &error) {
 	if (!error) {
 		return;
+	}
 	LOG4CXX_ERROR(logger, "Disconected from " << m_host << ". Will reconnect in 1 second.");
 	m_reconnectTimer->start();
+}
 void WebSocketClient::handleDNSResult(const std::vector<Swift::HostAddress> &addrs, boost::optional<Swift::DomainNameResolveError>) {
 	m_conn = m_tlsConnectionFactory->createConnection();
 	m_conn->onDataRead.connect(boost::bind(&WebSocketClient::handleDataRead, this, _1));
 	m_conn->onConnectFinished.connect(boost::bind(&WebSocketClient::handleConnected, this, _1));
 	m_conn->onDisconnected.connect(boost::bind(&WebSocketClient::handleDisconnected, this, _1));
 	m_conn->connect(Swift::HostAddressPort(addrs[0], 443));
+}
+}

0 comments (0 inline, 0 general)