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

29
ws/ws_cobra_metrics_to_redis.cpp
View File

@ -106,21 +106,18 @@ namespace ix
&msgPerSeconds,
&conditionVariableMutex,
&condition,
&queue](ix::CobraEventType eventType,
const std::string& errMsg,
const ix::WebSocketHttpHeaders& headers,
const std::string& subscriptionId,
CobraConnection::MsgId msgId) {
if (eventType == ix::CobraEventType::Open)
&queue](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);
}
}
else if (eventType == ix::CobraEventType::Authenticated)
else if (event->type == ix::CobraEventType::Authenticated)
{
spdlog::info("Subscriber authenticated");
@ -141,21 +138,21 @@ namespace ix
msgCount++;
});
}
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);
}
});

44
ws/ws_cobra_publish.cpp
View File

@ -38,22 +38,22 @@ namespace ix
std::atomic<bool> authenticated(false);
std::atomic<bool> messageAcked(false);
conn.setEventCallback([&conn, &channel, &data, &authenticated, &messageAcked](
ix::CobraEventType eventType,
const std::string& errMsg,
const ix::WebSocketHttpHeaders& headers,
const std::string& subscriptionId,
CobraConnection::MsgId msgId) {
if (eventType == ix::CobraEventType::Open)
conn.setEventCallback([&conn, &channel, &data, &authenticated, &messageAcked](const CobraEventPtr& event)
{
if (event->type == ix::CobraEventType::Open)
{
spdlog::info("Publisher connected");
for (auto it : headers)
for (auto&& it : event->headers)
{
spdlog::info("{}: {}", it.first, it.second);
}
}
else if (eventType == ix::CobraEventType::Authenticated)
else if (event->type == ix::CobraEventType::Closed)
{
spdlog::info("Subscriber closed: {}", event->errMsg);
}
else if (event->type == ix::CobraEventType::Authenticated)
{
spdlog::info("Publisher authenticated");
authenticated = true;
@ -64,27 +64,35 @@ namespace ix
spdlog::info("Published msg {}", msgId);
}
else if (eventType == ix::CobraEventType::Subscribed)
else if (event->type == ix::CobraEventType::Subscribed)
{
spdlog::info("Publisher: subscribed to channel {}", subscriptionId);
spdlog::info("Publisher: subscribed to channel {}", event->subscriptionId);
}
else if (eventType == ix::CobraEventType::UnSubscribed)
else if (event->type == ix::CobraEventType::UnSubscribed)
{
spdlog::info("Publisher: unsubscribed from channel {}", subscriptionId);
spdlog::info("Publisher: unsubscribed from channel {}", event->subscriptionId);
}
else if (eventType == ix::CobraEventType::Error)
else if (event->type == ix::CobraEventType::Error)
{
spdlog::error("Publisher: error {}", errMsg);
spdlog::error("Publisher: error {}", event->errMsg);
}
else if (eventType == ix::CobraEventType::Published)
else if (event->type == ix::CobraEventType::Published)
{
spdlog::info("Published message id {} acked", msgId);
spdlog::info("Published message id {} acked", event->msgId);
messageAcked = true;
}
else if (eventType == ix::CobraEventType::Pong)
else if (event->type == ix::CobraEventType::Pong)
{
spdlog::info("Received websocket pong");
}
else if (event->type == ix::CobraEventType::HandshakeError)
{
spdlog::error("Subscriber: Handshake error: {}", event->errMsg);
}
else if (event->type == ix::CobraEventType::AuthenticationError)
{
spdlog::error("Subscriber: Authentication error: {}", event->errMsg);
}
});
conn.connect();

47
ws/ws_cobra_subscribe.cpp
View File

@ -106,21 +106,22 @@ namespace ix
&msgPerSeconds,
&quiet,
&fluentd,
&fatalCobraError](ix::CobraEventType eventType,
const std::string& errMsg,
const ix::WebSocketHttpHeaders& headers,
const std::string& subscriptionId,
CobraConnection::MsgId msgId) {
if (eventType == ix::CobraEventType::Open)
&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);
}
}
else if (eventType == ix::CobraEventType::Authenticated)
else if (event->type == ix::CobraEventType::Closed)
{
spdlog::info("Subscriber closed: {}", event->errMsg);
}
else if (event->type == ix::CobraEventType::Authenticated)
{
spdlog::info("Subscriber authenticated");
spdlog::info("Subscribing to {} at position {}", channel, subscriptionPosition);
@ -145,39 +146,39 @@ namespace ix
subscriptionPosition = position;
});
}
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;
}
});