-
-
Notifications
You must be signed in to change notification settings - Fork 364
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add optional keep-alive mechanism to WS connections #509
Open
paupuerta
wants to merge
6
commits into
CrowCpp:master
Choose a base branch
from
paupuerta:keepalive_WebSocket
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- include/crow/websocket.h (before formatting)
+++ include/crow/websocket.h (after formatting)
@@ -261,7 +261,7 @@
do_read();
}
- void start_deadline(/*int timeout = 5*/)
+ void start_deadline(/*int timeout = 5*/)
{
cancel_deadline_timer();
@@ -711,7 +711,7 @@
std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler_;
std::function<void(crow::websocket::connection&, const std::string&)> close_handler_;
std::function<void(crow::websocket::connection&, const std::string&)> error_handler_;
- std::pair<std::function<void(crow::websocket::connection&, const std::string&)>,uint64_t> timeout_handler_;
+ std::pair<std::function<void(crow::websocket::connection&, const std::string&)>, uint64_t> timeout_handler_;
std::function<bool(const crow::request&, void**)> accept_handler_;
detail::task_timer task_timer_;
--- tests/unittest.cpp (before formatting)
+++ tests/unittest.cpp (after formatting)
@@ -2499,7 +2499,8 @@
.ontimeout([&](websocket::connection& conn, const std::string&) {
CROW_LOG_INFO << "Websocket Time Out";
conn.send_text("TimeOut");
- }, 2 /* seconds */)
+ },
+ 2 /* seconds */)
.onclose([&](websocket::connection&, const std::string&) {
CROW_LOG_INFO << "Closing websocket";
}); |
That's useful I think. What's the purpose of the string argument of the timeout handler? It's hardcoded to the string "timeout"? |
mrozigor
reviewed
Mar 9, 2024
@@ -509,6 +517,7 @@ namespace crow | |||
std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler_; | |||
std::function<void(crow::websocket::connection&, const std::string&)> close_handler_; | |||
std::function<void(crow::websocket::connection&, const std::string&)> error_handler_; | |||
std::pair<std::function<void(crow::websocket::connection&, const std::string&)>, uint64_t> timeout_handler_; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe use std::chrono for timeout type?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#506 To be able to keepalive to WS connections, this PR adds a new callback to allow do something every x seconds while not receiving messages.