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

clang-format

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-04-16 11:58:06 -07:00
parent 9b8cfa0a37
commit ccfd196863
7 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ixwebsocket/IXWebSocketOpenInfo.h
View File

@ -6,9 +6,9 @@
#pragma once #pragma once
#include "IXWebSocketHttpHeaders.h"
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "IXWebSocketHttpHeaders.h"
namespace ix namespace ix
{ {

3
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -222,7 +222,8 @@ namespace ix
{ {
_pongReceived = false; _pongReceived = false;
std::stringstream ss; std::stringstream ss;
ss << kPingMessage << "::" << _pingIntervalSecs << "s" << "::" << _pingCount++; ss << kPingMessage << "::" << _pingIntervalSecs << "s"
<< "::" << _pingCount++;
return sendPing(ss.str()); return sendPing(ss.str());
} }

3
test/IXCobraChatTest.cpp
View File

@ -180,8 +180,7 @@ namespace
_conn.configure(_cobraConfig); _conn.configure(_cobraConfig);
_conn.connect(); _conn.connect();
_conn.setEventCallback([this, channel](const CobraEventPtr& event) _conn.setEventCallback([this, channel](const CobraEventPtr& event) {
{
if (event->type == ix::CobraEventType::Open) if (event->type == ix::CobraEventType::Open)
{ {
log("Subscriber connected: " + _user); log("Subscriber connected: " + _user);

3
test/IXCobraMetricsPublisherTest.cpp
View File

@ -54,8 +54,7 @@ namespace
conn.configure(config); conn.configure(config);
conn.connect(); conn.connect();
conn.setEventCallback([&conn, &channel](const CobraEventPtr& event) conn.setEventCallback([&conn, &channel](const CobraEventPtr& event) {
{
if (event->type == ix::CobraEventType::Open) if (event->type == ix::CobraEventType::Open)
{ {
TLogger() << "Subscriber connected:"; TLogger() << "Subscriber connected:";

3
ws/ws_cobra_metrics_to_redis.cpp
View File

@ -106,8 +106,7 @@ namespace ix
&msgPerSeconds, &msgPerSeconds,
&conditionVariableMutex, &conditionVariableMutex,
&condition, &condition,
&queue](const CobraEventPtr& event) &queue](const CobraEventPtr& event) {
{
if (event->type == ix::CobraEventType::Open) if (event->type == ix::CobraEventType::Open)
{ {
spdlog::info("Subscriber connected"); spdlog::info("Subscriber connected");

104
ws/ws_cobra_publish.cpp
View File

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

3
ws/ws_cobra_subscribe.cpp
View File

@ -106,8 +106,7 @@ namespace ix
&msgPerSeconds, &msgPerSeconds,
&quiet, &quiet,
&fluentd, &fluentd,
&fatalCobraError](const CobraEventPtr& event) &fatalCobraError](const CobraEventPtr& event) {
{
if (event->type == ix::CobraEventType::Open) if (event->type == ix::CobraEventType::Open)
{ {
spdlog::info("Subscriber connected"); spdlog::info("Subscriber connected");