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

(ixcobra) change cobra event callback to use a struct instead of several objects, which is more flexible/extensible

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-04-15 17:38:21 -07:00
parent 71a421eefc
commit 64754df66c
13 changed files with 224 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ixbots/ixbots/IXCobraToSentryBot.cpp
View File

@ -181,25 +181,22 @@ namespace ix
&throttled,
&receivedCount,
&fatalCobraError,
&queueManager](ix::CobraEventType eventType,
const std::string& errMsg,
const ix::WebSocketHttpHeaders& headers,
const std::string& subscriptionId,
CobraConnection::MsgId msgId) {
if (eventType == ix::CobraEventType::Open)
&queueManager](const CobraEventPtr& event)
{
if (event->type == ix::CobraEventType::Open)
{
spdlog::info("Subscriber connected");
for (auto it : headers)
for (auto&& it : event->headers)
{
spdlog::info("{}: {}", it.first, it.second);
}
}
if (eventType == ix::CobraEventType::Closed)
else if (event->type == ix::CobraEventType::Closed)
{
spdlog::info("Subscriber closed");
spdlog::info("Subscriber closed: {}", event->errMsg);
}
else if (eventType == ix::CobraEventType::Authenticated)
else if (event->type == ix::CobraEventType::Authenticated)
{
spdlog::info("Subscriber authenticated");
conn.subscribe(channel,
@ -222,39 +219,39 @@ namespace ix
queueManager.add(msg);
});
}
else if (eventType == ix::CobraEventType::Subscribed)
else if (event->type == ix::CobraEventType::Subscribed)
{
spdlog::info("Subscriber: subscribed to channel {}", subscriptionId);
spdlog::info("Subscriber: subscribed to channel {}", event->subscriptionId);
}
else if (eventType == ix::CobraEventType::UnSubscribed)
else if (event->type == ix::CobraEventType::UnSubscribed)
{
spdlog::info("Subscriber: unsubscribed from channel {}", subscriptionId);
spdlog::info("Subscriber: unsubscribed from channel {}", event->subscriptionId);
}
else if (eventType == ix::CobraEventType::Error)
else if (event->type == ix::CobraEventType::Error)
{
spdlog::error("Subscriber: error {}", errMsg);
spdlog::error("Subscriber: error {}", event->errMsg);
}
else if (eventType == ix::CobraEventType::Published)
else if (event->type == ix::CobraEventType::Published)
{
spdlog::error("Published message hacked: {}", msgId);
spdlog::error("Published message hacked: {}", event->msgId);
}
else if (eventType == ix::CobraEventType::Pong)
else if (event->type == ix::CobraEventType::Pong)
{
spdlog::info("Received websocket pong");
}
else if (eventType == ix::CobraEventType::HandshakeError)
else if (event->type == ix::CobraEventType::HandshakeError)
{
spdlog::error("Subscriber: Handshake error: {}", errMsg);
spdlog::error("Subscriber: Handshake error: {}", event->errMsg);
fatalCobraError = true;
}
else if (eventType == ix::CobraEventType::AuthenticationError)
else if (event->type == ix::CobraEventType::AuthenticationError)
{
spdlog::error("Subscriber: Authentication error: {}", errMsg);
spdlog::error("Subscriber: Authentication error: {}", event->errMsg);
fatalCobraError = true;
}
else if (eventType == ix::CobraEventType::SubscriptionError)
else if (event->type == ix::CobraEventType::SubscriptionError)
{
spdlog::error("Subscriber: Subscription error: {}", errMsg);
spdlog::error("Subscriber: Subscription error: {}", event->errMsg);
fatalCobraError = true;
}
});

48
ixbots/ixbots/IXCobraToStatsdBot.cpp
View File

@ -201,26 +201,22 @@ namespace ix
std::thread t3(statsdSender);
conn.setEventCallback(
[&conn, &channel, &filter, &position, &jsonWriter, verbose, &queueManager, &receivedCount, &fatalCobraError](
ix::CobraEventType eventType,
const std::string& errMsg,
const ix::WebSocketHttpHeaders& headers,
const std::string& subscriptionId,
CobraConnection::MsgId msgId) {
if (eventType == ix::CobraEventType::Open)
[&conn, &channel, &filter, &position, &jsonWriter, verbose, &queueManager, &receivedCount, &fatalCobraError](const CobraEventPtr& event)
{
if (event->type == ix::CobraEventType::Open)
{
spdlog::info("Subscriber connected");
for (auto it : headers)
for (auto&& it : event->headers)
{
spdlog::info("{}: {}", it.first, it.second);
}
}
if (eventType == ix::CobraEventType::Closed)
else if (event->type == ix::CobraEventType::Closed)
{
spdlog::info("Subscriber closed");
spdlog::info("Subscriber closed: {}", event->errMsg);
}
else if (eventType == ix::CobraEventType::Authenticated)
else if (event->type == ix::CobraEventType::Authenticated)
{
spdlog::info("Subscriber authenticated");
conn.subscribe(channel,
@ -239,39 +235,39 @@ namespace ix
queueManager.add(msg);
});
}
else if (eventType == ix::CobraEventType::Subscribed)
else if (event->type == ix::CobraEventType::Subscribed)
{
spdlog::info("Subscriber: subscribed to channel {}", subscriptionId);
spdlog::info("Subscriber: subscribed to channel {}", event->subscriptionId);
}
else if (eventType == ix::CobraEventType::UnSubscribed)
else if (event->type == ix::CobraEventType::UnSubscribed)
{
spdlog::info("Subscriber: unsubscribed from channel {}", subscriptionId);
spdlog::info("Subscriber: unsubscribed from channel {}", event->subscriptionId);
}
else if (eventType == ix::CobraEventType::Error)
else if (event->type == ix::CobraEventType::Error)
{
spdlog::error("Subscriber: error {}", errMsg);
spdlog::error("Subscriber: error {}", event->errMsg);
}
else if (eventType == ix::CobraEventType::Published)
else if (event->type == ix::CobraEventType::Published)
{
spdlog::error("Published message hacked: {}", msgId);
spdlog::error("Published message hacked: {}", event->msgId);
}
else if (eventType == ix::CobraEventType::Pong)
else if (event->type == ix::CobraEventType::Pong)
{
spdlog::info("Received websocket pong");
}
else if (eventType == ix::CobraEventType::HandshakeError)
else if (event->type == ix::CobraEventType::HandshakeError)
{
spdlog::error("Subscriber: Handshake error: {}", errMsg);
spdlog::error("Subscriber: Handshake error: {}", event->errMsg);
fatalCobraError = true;
}
else if (eventType == ix::CobraEventType::AuthenticationError)
else if (event->type == ix::CobraEventType::AuthenticationError)
{
spdlog::error("Subscriber: Authentication error: {}", errMsg);
spdlog::error("Subscriber: Authentication error: {}", event->errMsg);
fatalCobraError = true;
}
else if (eventType == ix::CobraEventType::SubscriptionError)
else if (event->type == ix::CobraEventType::SubscriptionError)
{
spdlog::error("Subscriber: Subscription error: {}", errMsg);
spdlog::error("Subscriber: Subscription error: {}", event->errMsg);
fatalCobraError = true;
}
});