remove un-needed _backgroundThreadRunning variable
This commit is contained in:
parent
0c2d1c22bc
commit
14ec8522ef
@ -38,7 +38,6 @@ namespace ix
|
||||
WebSocket::WebSocket() :
|
||||
_onMessageCallback(OnMessageCallback()),
|
||||
_stop(false),
|
||||
_backgroundThreadRunning(false),
|
||||
_automaticReconnection(true),
|
||||
_handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs),
|
||||
_enablePong(kDefaultEnablePong),
|
||||
@ -136,7 +135,6 @@ namespace ix
|
||||
{
|
||||
if (_thread.joinable()) return; // we've already been started
|
||||
|
||||
_backgroundThreadRunning = true;
|
||||
_thread = std::thread(&WebSocket::run, this);
|
||||
}
|
||||
|
||||
@ -157,7 +155,6 @@ namespace ix
|
||||
|
||||
_stop = true;
|
||||
_thread.join();
|
||||
_backgroundThreadRunning = false;
|
||||
_stop = false;
|
||||
|
||||
_automaticReconnection = automaticReconnection;
|
||||
@ -343,9 +340,7 @@ namespace ix
|
||||
WebSocket::invokeTrafficTrackerCallback(msg.size(), true);
|
||||
});
|
||||
|
||||
// 4. In blocking mode, getting out of this function is triggered by
|
||||
// an explicit disconnection from the callback, or by the remote end
|
||||
// closing the connection, ie isConnected() == false.
|
||||
// If we aren't trying to reconnect automatically, exit if we aren't connected
|
||||
if (!isConnected() && !_automaticReconnection) return;
|
||||
}
|
||||
}
|
||||
|
@ -154,7 +154,6 @@ namespace ix
|
||||
static OnTrafficTrackerCallback _onTrafficTrackerCallback;
|
||||
|
||||
std::atomic<bool> _stop;
|
||||
std::atomic<bool> _backgroundThreadRunning;
|
||||
std::atomic<bool> _automaticReconnection;
|
||||
std::thread _thread;
|
||||
std::mutex _writeMutex;
|
||||
|
@ -553,7 +553,7 @@ namespace ix
|
||||
// Get the reason.
|
||||
std::string reason(_rxbuf.begin()+ws.header_size + 2,
|
||||
_rxbuf.begin()+ws.header_size + (size_t) ws.N);
|
||||
|
||||
|
||||
bool remote = true;
|
||||
|
||||
close(code, reason, _rxbuf.size(), remote);
|
||||
|
@ -41,7 +41,7 @@ namespace ix
|
||||
{
|
||||
if (!redisClient.publish(channel, message, errMsg))
|
||||
{
|
||||
std::cerr << "Error publishing to channel " << channel
|
||||
std::cerr << "Error publishing to channel " << channel
|
||||
<< "error: " << errMsg
|
||||
<< std::endl;
|
||||
return 1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user