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

(ixbots) fix tsan data race error when accessing verbose parameter

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-05-04 17:15:35 -07:00
parent 4f17cd5e74
commit af003fc79b
8 changed files with 5 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ixbots/ixbots/IXCobraToSentryBot.cpp
View File

@@ -26,42 +26,19 @@ namespace ix
int runtime)
{
CobraBot bot;
bot.setOnBotMessageCallback([&sentryClient](const Json::Value& msg,
bot.setOnBotMessageCallback([&sentryClient, &verbose](const Json::Value& msg,
const std::string& /*position*/,
const bool verbose,
std::atomic<bool>& throttled,
std::atomic<bool>& /*fatalCobraError*/,
std::atomic<uint64_t>& sentCount) -> void {
sentryClient.send(msg, verbose,
[&sentCount, &throttled, &verbose](const HttpResponsePtr& response) {
[&sentCount, &throttled](const HttpResponsePtr& response) {
if (!response)
{
CoreLogger::warn("Null HTTP Response");
return;
}
if (verbose)
{
for (auto it : response->headers)
{
CoreLogger::info(it.first + ": " + it.second);
}
CoreLogger::info("Upload size: " + std::to_string(response->uploadSize));
CoreLogger::info("Download size: " + std::to_string(response->downloadSize));
CoreLogger::info("Status: " + std::to_string(response->statusCode));
if (response->errorCode != HttpErrorCode::Ok)
{
CoreLogger::info("error message: " + response->errorMsg);
}
if (response->headers["Content-Type"] != "application/octet-stream")
{
CoreLogger::info("payload: " + response->payload);
}
}
if (response->statusCode == 200)
{
sentCount++;
@@ -103,7 +80,6 @@ namespace ix
channel,
filter,
position,
verbose,
enableHeartbeat,
runtime);
}