gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amqp_consume_message now has a timeout

Browse Source 
RabbitMQ::consume() will return an empty string if the call to amqp_consume_message times out
This commit is contained in:
Grant Limberg
2019-04-18 14:57:06 -07:00
parent 6014df2847
commit 6a027c9c0a
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controller/PostgreSQL.cpp
View File

@@ -666,6 +666,9 @@ void PostgreSQL::_membersWatcher_RabbitMQ() {
try {
std::string msg = rmq.consume();
// fprintf(stderr, "Got Member Update: %s\n", msg.c_str());
if (msg.empty()) {
continue;
}
json tmp(json::parse(msg));
json &ov = tmp["old_val"];
json &nv = tmp["new_val"];
@@ -766,6 +769,9 @@ void PostgreSQL::_networksWatcher_RabbitMQ() {
while (_run == 1) {
try {
std::string msg = rmq.consume();
if (msg.empty()) {
continue;
}
// fprintf(stderr, "Got network update: %s\n", msg.c_str());
json tmp(json::parse(msg));
json &ov = tmp["old_val"];