]> git.saurik.com Git - redis.git/commitdiff
if server.saveparamslen is not set, don't save the DB on exit.
authorRobey Pointer <robey@twitter.com>
Thu, 30 Sep 2010 18:53:34 +0000 (11:53 -0700)
committerantirez <antirez@gmail.com>
Fri, 22 Oct 2010 21:17:28 +0000 (23:17 +0200)
src/redis.c

index 7749cb902227d262f86f63e070b6e6b0224c1e73..c1dc5e123465c69649f155fdf7eead9ce8bcb428 100644 (file)
@@ -1093,7 +1093,7 @@ int prepareForShutdown() {
         /* Append only file: fsync() the AOF and exit */
         aof_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) {
             /* Ooops.. error saving! The best we can do is to continue
@@ -1104,6 +1104,8 @@ int prepareForShutdown() {
             redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit");
             return REDIS_ERR;
         }
+    } else {
+        redisLog(REDIS_WARNING,"Not saving DB.");
     }
     if (server.daemonize) unlink(server.pidfile);
     redisLog(REDIS_WARNING,"Server exit now, bye bye...");