Now MONITOR/SYNC cannot be issued multiple times

diff --git a/TODO b/TODO
index 7d91a10331937c9a4b39e5006113e8c77c599a12..9bf8644f471a0c65f58cb3a934de04a1eccbb463 100644 (file)
--- a/TODO
+++ b/TODO
@@ -34,3 +34,5 @@ ROLLBACK command:
     COMMIT
 
     but this sucks since there is no way to check the error message.
+
+- Prevent the client to issue SYNC or MONITOR multiple times

diff --git a/redis.c b/redis.c
index c7b10dfde8841bba3bd7b28c434e54eb8a79debe..0fc6679519bc66cc660081a88a5220711082915b 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -2919,6 +2919,9 @@ static void syncCommand(redisClient *c) {
     time_t start = time(NULL);
     char sizebuf[32];
 
+    /* ignore SYNC if aleady slave or in monitor mode */
+    if (c->flags & REDIS_SLAVE) return;
+
     redisLog(REDIS_NOTICE,"Slave ask for syncronization");
     if (flushClientOutput(c) == REDIS_ERR || saveDb(server.dbfilename) != REDIS_OK)
         goto closeconn;
@@ -3029,6 +3032,9 @@ static int syncWithMaster(void) {
 }
 
 static void monitorCommand(redisClient *c) {
+    /* ignore MONITOR if aleady slave or in monitor mode */
+    if (c->flags & REDIS_SLAVE) return;
+
     c->flags |= (REDIS_SLAVE|REDIS_MONITOR);
     c->slaveseldb = 0;
     if (!listAddNodeTail(server.monitors,c)) oom("listAddNodeTail");