commit d8a717fb backported from master to 2.2 (do not save DB if no save interval configured with RDB, by Robey Pointer).

1 files changed, 3 insertions, 1 deletions

diff --git a/redis.c b/redis.c
index fefaa6bd1..9d02b4524 100644
--- a/redis.c
+++ b/redis.c
@@ -4221,7 +4221,7 @@ static int prepareForShutdown() {
         /* Append only file: fsync() the AOF and exit */
         fsync(server.appendfd);
         if (server.vm_enabled) unlink(server.vm_swap_file);
-    } else {
+    } else if (server.saveparamslen > 0) {
         /* Snapshotting. Perform a SYNC SAVE and exit */
         if (rdbSave(server.dbfilename) == REDIS_OK) {
             if (server.daemonize)
@@ -4236,6 +4236,8 @@ static int prepareForShutdown() {
             redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit");
             return REDIS_ERR;
         }
+    } else {
+        redisLog(REDIS_WARNING,"Not saving DB.");
     }
     redisLog(REDIS_WARNING,"Server exit now, bye bye...");
     return REDIS_OK;