【FIX】连接异常或者正常断开的时候都应该立即终止重连的定时任务，优化socket对象的构造时机

Author: chengxin

include/tigerapi/push_socket/push_client_impl.h

@@ -38,7 +38,6 @@ namespace TIGER_API
 	private:
 		std::function<void(const tigeropen::push::pb::AssetData&)> asset_changed_;
 	private:
-		ClientConfig client_config_;
 		boost::asio::io_service io_service_;
 		std::shared_ptr<TIGER_API::PushSocket> socket_;
 		std::shared_ptr<std::thread> worker_thread_;

src/push_socket/push_client_impl.cpp

@@ -21,9 +21,8 @@ TIGER_API::PushClientImpl::~PushClientImpl()
 }
 
 TIGER_API::PushClientImpl::PushClientImpl(const TIGER_API::ClientConfig& client_config)
-	:client_config_(client_config)
 {
-
+	socket_ = PushSocket::create_push_socket(&io_service_, client_config);
 }
 
 void TIGER_API::PushClientImpl::connect()
@@ -32,7 +31,7 @@ void TIGER_API::PushClientImpl::connect()
 	//启动工作线程
 	worker_thread_ = std::shared_ptr<std::thread>(new std::thread([this]
 	{
-		socket_ = PushSocket::create_push_socket(&io_service_, client_config_);
+		
 		socket_->connect();
 
 		LOG(INFO) << "io_service run on work thread";
@@ -48,26 +47,17 @@ void TIGER_API::PushClientImpl::disconnect()
 
 void TIGER_API::PushClientImpl::set_connected_callback(const std::function<void()>& cb)
 {
-	if (socket_)
-	{
-		socket_->set_connected_callback(cb);
-	}
+	socket_->set_connected_callback(cb);
 }
 
 void TIGER_API::PushClientImpl::set_disconnected_callback(const std::function<void()>& cb)
 {
-	if (socket_)
-	{
-		socket_->set_disconnected_callback(cb);
-	}
+	socket_->set_disconnected_callback(cb);
 }
 
 void TIGER_API::PushClientImpl::set_inner_error_callback(const std::function<void(std::string)>& cb)
 {
-	if (socket_)
-	{
-		socket_->set_inner_error_callback(cb);
-	}
+	socket_->set_inner_error_callback(cb);
 }
 
 void TIGER_API::PushClientImpl::set_asset_changed_callback(const std::function<void(const tigeropen::push::pb::AssetData&)>& cb)
@@ -77,7 +67,7 @@ void TIGER_API::PushClientImpl::set_asset_changed_callback(const std::function<v
 
 bool TIGER_API::PushClientImpl::subscribe_asset(const std::string& account)
 {
-	if (!socket_)
+	if (account.empty())
 	{
 		return false;
 	}
@@ -100,7 +90,7 @@ bool TIGER_API::PushClientImpl::subscribe_asset(const std::string& account)
 
 bool TIGER_API::PushClientImpl::unsubscribe_asset(const std::string& account)
 {
-	if (!socket_)
+	if (account.empty())
 	{
 		return false;
 	}
@@ -144,18 +134,12 @@ bool TIGER_API::PushClientImpl::send_frame(const tigeropen::push::pb::Request& r
 
 void TIGER_API::PushClientImpl::do_write(const std::string& frame)
 {
-	if (socket_)
-	{
-		socket_->send_message(frame);
-	}
+	socket_->send_message(frame);
 }
 
 void TIGER_API::PushClientImpl::do_disconnect()
 {
-	if (socket_)
-	{
-		socket_->disconnect();
-	}
+	socket_->disconnect();
 }
 
 void TIGER_API::PushClientImpl::on_message(const std::shared_ptr<tigeropen::push::pb::Response>& response_pb_object)

src/push_socket/push_socket.cpp

@@ -31,10 +31,7 @@ TIGER_API::PushSocket::PushSocket(boost::asio::io_service* io_service,
 	client_config_ = client_config;
 	send_interval_ = client_config_.send_interval;
 	recv_interval_ = client_config_.receive_interval;
-
-	init_socket();
-	socket_->set_verify_callback(boost::bind(&PushSocket::verify_certificate, this, _1, _2));
-
+	
 	//初始化内存池，防止接收数据频繁的内存分配和释放引起的性能问题和内存碎片问题
 	recv_buff_pool_.reset(new boost::pool<>(MEMORY_POOL_PAGE_SIZE, MEMORY_POOL_BLOCK_NUM));
 
@@ -78,6 +75,8 @@ void TIGER_API::PushSocket::connect()
 		std::string str_target_server_ip = rit->endpoint().address().to_string();
 		LOG(INFO) << "resolved ip: " << str_target_server_ip;
 
+		init_socket();
+
 		socket_->lowest_layer().async_connect(*rit,
 			boost::bind(&PushSocket::handle_connect, this, boost::asio::placeholders::error, ++rit));
 
@@ -95,12 +94,6 @@ void TIGER_API::PushSocket::disconnect()
 	{
 		keep_alive_timer_->cancel();
 	}
-
-	if (reconnect_timer_)
-	{
-		reconnect_timer_->cancel();
-	}
-
 	close_session();
 }
 
@@ -148,6 +141,8 @@ void TIGER_API::PushSocket::init_socket()
 	}
 
 	socket_.emplace(*io_service_, ssl_content);
+
+	socket_->set_verify_callback(boost::bind(&PushSocket::verify_certificate, this, _1, _2));
 }
 
 bool TIGER_API::PushSocket::verify_certificate(bool preverified, boost::asio::ssl::verify_context& ctx)
@@ -175,6 +170,11 @@ uint32_t TIGER_API::PushSocket::get_next_id()
 
 void TIGER_API::PushSocket::close_session()
 {
+	if (reconnect_timer_)
+	{
+		reconnect_timer_->cancel();
+	}
+	
 	LOG(INFO) << "close socket";
 	socket_state_ = SocketState::DISCONNECTED;
 
@@ -259,7 +259,7 @@ void TIGER_API::PushSocket::send_heart_beat()
 
 void TIGER_API::PushSocket::auto_reconnect()
 {
-	LOG(INFO) << "try reconnecting after" << reconnect_interval_ / 1000 << "seconds...";
+	LOG(INFO) << "try reconnecting after " << reconnect_interval_ / 1000 << " seconds...";
 	socket_state_  = SocketState::CONNECTING;
 	reconnect_timer_->expires_from_now(boost::posix_time::milliseconds(reconnect_interval_));
 	reconnect_timer_->async_wait([this](const boost::system::error_code& error)