Merge branch 'test_vm' of git://github.com/pietern/redis

diff --git a/redis.c b/redis.c
index 721a9125287697ee249778af2846f21a39575584..d6c6cbdf2636bb9b34fbd59ad3a5410b3a46a419 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -4180,7 +4180,6 @@ static int prepareForShutdown() {
             if (server.daemonize)
                 unlink(server.pidfile);
             redisLog(REDIS_WARNING,"%zu bytes used at exit",zmalloc_used_memory());
-            redisLog(REDIS_WARNING,"Server exit now, bye bye...");
         } else {
             /* Ooops.. error saving! The best we can do is to continue
              * operating. Note that if there was a background saving process,
@@ -4191,6 +4190,7 @@ static int prepareForShutdown() {
             return REDIS_ERR;
         }
     }
+    redisLog(REDIS_WARNING,"Server exit now, bye bye...");
     return REDIS_OK;
 }