adding in mutex for local store of messages
This commit is contained in:
@@ -3,5 +3,10 @@
|
|||||||
"directory": "/home/talksik/code/homechat/server/build",
|
"directory": "/home/talksik/code/homechat/server/build",
|
||||||
"command": "/usr/bin/c++ -I/home/talksik/code/homechat/server/src/include -g -o CMakeFiles/HomechatServer.dir/src/Main.cpp.o -c /home/talksik/code/homechat/server/src/Main.cpp",
|
"command": "/usr/bin/c++ -I/home/talksik/code/homechat/server/src/include -g -o CMakeFiles/HomechatServer.dir/src/Main.cpp.o -c /home/talksik/code/homechat/server/src/Main.cpp",
|
||||||
"file": "/home/talksik/code/homechat/server/src/Main.cpp"
|
"file": "/home/talksik/code/homechat/server/src/Main.cpp"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"directory": "/home/talksik/code/homechat/server/build",
|
||||||
|
"command": "/usr/bin/c++ -I/home/talksik/code/homechat/server/src/include -g -o CMakeFiles/HomechatServer.dir/src/MessageCache.cpp.o -c /home/talksik/code/homechat/server/src/MessageCache.cpp",
|
||||||
|
"file": "/home/talksik/code/homechat/server/src/MessageCache.cpp"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
+17
-2
@@ -12,6 +12,7 @@ int main()
|
|||||||
{
|
{
|
||||||
std::cout << "Welcome to the homechat server!\n";
|
std::cout << "Welcome to the homechat server!\n";
|
||||||
|
|
||||||
|
std::mutex message_cache_mutex;
|
||||||
std::unique_ptr<MessageCache> message_cache = std::make_unique<MessageCache>();
|
std::unique_ptr<MessageCache> message_cache = std::make_unique<MessageCache>();
|
||||||
|
|
||||||
/* ws->getUserData returns one of these */
|
/* ws->getUserData returns one of these */
|
||||||
@@ -39,7 +40,7 @@ int main()
|
|||||||
/* Handlers */
|
/* Handlers */
|
||||||
.upgrade = nullptr,
|
.upgrade = nullptr,
|
||||||
.open =
|
.open =
|
||||||
[](uWS::WebSocket<false, true, PerSocketData> *ws) {
|
[&](uWS::WebSocket<false, true, PerSocketData> *ws) {
|
||||||
auto user_data = ws->getUserData();
|
auto user_data = ws->getUserData();
|
||||||
user_data->created_at = DateTime::now();
|
user_data->created_at = DateTime::now();
|
||||||
|
|
||||||
@@ -49,15 +50,29 @@ int main()
|
|||||||
std::cout << "Failed to subscribe to * channel\n";
|
std::cout << "Failed to subscribe to * channel\n";
|
||||||
ws->close();
|
ws->close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::lock_guard<std::mutex> lock(message_cache_mutex);
|
||||||
|
auto messages = message_cache->last_ten_messages();
|
||||||
|
ws->send(std::string("Welcome to the homechat server! Here are the last 10 messages: \n"), uWS::OpCode::TEXT, false);
|
||||||
|
for (auto &message : messages)
|
||||||
|
{
|
||||||
|
ws->send(message, uWS::OpCode::TEXT, false);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
.message =
|
.message =
|
||||||
[](uWS::WebSocket<false, true, PerSocketData> *ws, std::string_view message, uWS::OpCode opCode) {
|
[&](uWS::WebSocket<false, true, PerSocketData> *ws, std::string_view message, uWS::OpCode opCode) {
|
||||||
/* This is the opposite of what you probably want; compress if message is LARGER than 16 kb
|
/* This is the opposite of what you probably want; compress if message is LARGER than 16 kb
|
||||||
* the reason we do the opposite here; compress if SMALLER than 16 kb is to allow for
|
* the reason we do the opposite here; compress if SMALLER than 16 kb is to allow for
|
||||||
* benchmarking of large message sending without compression */
|
* benchmarking of large message sending without compression */
|
||||||
std::cout << "Message received: " << message << std::endl;
|
std::cout << "Message received: " << message << std::endl;
|
||||||
ws->send(message, opCode, false);
|
ws->send(message, opCode, false);
|
||||||
ws->publish("*", message, opCode, false);
|
ws->publish("*", message, opCode, false);
|
||||||
|
|
||||||
|
std::lock_guard<std::mutex> lock(message_cache_mutex);
|
||||||
|
if (!message_cache->add_message(std::string(message)))
|
||||||
|
{
|
||||||
|
std::cerr << "Failed to add message to cache" << std::endl;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
.dropped =
|
.dropped =
|
||||||
[](auto * /*ws*/, std::string_view /*message*/, uWS::OpCode /*opCode*/) {
|
[](auto * /*ws*/, std::string_view /*message*/, uWS::OpCode /*opCode*/) {
|
||||||
|
|||||||
Reference in New Issue
Block a user