From ee8b16a7d8f4bea18a4fe36147dc6569c8512d00 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Sat, 24 Sep 2016 00:13:54 +1000
Subject: [PATCH] * sources/redis.c : enable non-blocking mode & subscribing on
 connect

---
 src/sources/redis.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/sources/redis.c b/src/sources/redis.c
index 877adda..d3a6d24 100644
--- a/src/sources/redis.c
+++ b/src/sources/redis.c
@@ -42,7 +42,7 @@ redis_connect(cfg_t *cfg) {
   redisContext *conn = NULL;
   redisReply *reply = NULL;
   do {
-    struct timeval timeout = { cfg->timeout, 0 };
+    struct timeval timeout = { .tv_sec = cfg->timeout, .tv_usec = 0 };
     conn = redisConnectWithTimeout(cfg->host, cfg->port, timeout);
     if (!conn)
       break;
@@ -66,6 +66,18 @@ redis_connect(cfg_t *cfg) {
       }
       freeReplyObject(reply);
     }
+    timeout.tv_sec  = 0;
+    timeout.tv_usec = 10000; /* 0.01s */
+    if (redisSetTimeout(conn, timeout) != REDIS_OK) {
+      strlcpy(cfg->error, "can't enable nonblocking mode", sizeof(cfg->error));
+      break;
+    }
+    reply = redisCommand(conn, "SUBSCRIBE %s", cfg->hash);
+    if (reply->type == REDIS_REPLY_ERROR) {
+      snprintf(cfg->error, sizeof(cfg->error), "can't subscribe: %s", reply->str);
+      break;
+    }
+    freeReplyObject(reply);
     if (cfg->conn)
       redisFree(cfg->conn);
     cfg->conn = conn;