we should not clear the timeout error in normal case, and only clear …

…it when consuming published message
sewenew · Oct 18, 2019 · 6fa030b · 6fa030b
1 parent b4d1d0a
commit 6fa030b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/sw/redis++/connection.h b/src/sw/redis++/connection.h
@@ -101,6 +101,10 @@ class Connection {
         return _ctx->err != REDIS_OK;
     }
 
+    void reset() noexcept {
+        _ctx->err = 0;
+    }
+
     void reconnect();
 
     auto last_active() const

diff --git a/src/sw/redis++/errors.cpp b/src/sw/redis++/errors.cpp
@@ -49,8 +49,7 @@ void throw_error(redisContext &context, const std::string &err_info) {
 
     switch (err_code) {
     case REDIS_ERR_IO:
-        if (errno == EAGAIN) {
-            context.err = 0;
+        if (errno == EAGAIN || errno == EINTR) {
             throw TimeoutError(err_msg);
         } else {
             throw IoError(err_msg);

diff --git a/src/sw/redis++/subscriber.cpp b/src/sw/redis++/subscriber.cpp
@@ -76,7 +76,13 @@ void Subscriber::punsubscribe(const StringView &pattern) {
 void Subscriber::consume() {
     _check_connection();
 
-    auto reply = _connection.recv();
+    ReplyUPtr reply;
+    try {
+        reply = _connection.recv();
+    } catch (const TimeoutError &) {
+        _connection.reset();
+        throw;
+    }
 
     assert(reply);