amqp_consume_message now has a timeout

RabbitMQ::consume() will return an empty string if the call to amqp_consume_message times out

1 files changed, 6 insertions, 0 deletions

diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp
index ad53bc54..9aa4fbaa 100644
--- a/controller/PostgreSQL.cpp
+++ b/controller/PostgreSQL.cpp
@@ -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"];