kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixcobra / fix crash in CobraConnection::publishNext when the queue is empty + handle CobraConnection_PublishMode_Batch in CobraMetricsThreadedPublisher

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-28 10:36:47 -07:00
parent 7e1a60e61d
commit 0ee675e554
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ixcobra/ixcobra/IXCobraConnection.cpp
View File

@ -233,6 +233,11 @@ namespace ix
_publishMode = publishMode;
}
CobraConnectionPublishMode CobraConnection::getPublishMode()
{
return _publishMode;
}
void CobraConnection::configure(const std::string& appkey,
const std::string& endpoint,
const std::string& rolename,
@ -487,10 +492,11 @@ namespace ix
{
std::lock_guard<std::mutex> lock(_queueMutex);
if (_messageQueue.empty()) return true;
auto&& msg = _messageQueue.back();
if (!publishMessage(msg))
{
_messageQueue.push_back(msg);
return false;
}
_messageQueue.pop_back();

3
ixcobra/ixcobra/IXCobraConnection.h
View File

@ -114,6 +114,9 @@ namespace ix
/// Set the publish mode
void setPublishMode(CobraConnectionPublishMode publishMode);
/// Query the publish mode
CobraConnectionPublishMode getPublishMode();
/// Lifecycle management. Free resources when backgrounding
void suspend();
void resume();

5
ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp
View File

@ -166,7 +166,10 @@ namespace ix
case MessageKind::Message:
{
_cobra_connection.publishNext();
if (_cobra_connection.getPublishMode() == CobraConnection_PublishMode_Immediate)
{
_cobra_connection.publishNext();
}
}; break;
}
}