From: antirez <antirez@gmail.com>
Date: Thu, 20 May 2010 11:59:59 +0000 (+0200)
Subject: Merge branch 'test_vm' of git://github.com/pietern/redis
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/6185fd3532704ef28012194d18ceda40096e332b?hp=f166bb1d500dcecb14bff13312a4e7d2a76356c7

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

diff --git a/redis.c b/redis.c
index 721a9125..d6c6cbdf 100644
--- 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;
 }