fixed a few bugs in DS store, now it's somewhat about able to reply to 'GET foo'...

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 652d18ca41e994b6e6133d06cf2b6ae3559de7e3..36b7c853ec8c493c8a7c6cde146761714bf66bba 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1050,7 +1050,9 @@ int prepareForShutdown() {
         kill(server.bgsavechildpid,SIGKILL);
         rdbRemoveTempFile(server.bgsavechildpid);
     }
         kill(server.bgsavechildpid,SIGKILL);
         rdbRemoveTempFile(server.bgsavechildpid);
     }

-    if (server.appendonly) {
+    if (server.ds_enabled) {
+        /* FIXME: flush all objects on disk */
+    } else if (server.appendonly) {

         /* Append only file: fsync() the AOF and exit */
         aof_fsync(server.appendfd);
     } else if (server.saveparamslen > 0) {
         /* Append only file: fsync() the AOF and exit */
         aof_fsync(server.appendfd);
     } else if (server.saveparamslen > 0) {


@@ -1494,7 +1496,7 @@ int main(int argc, char **argv) {
 #endif
     start = time(NULL);
     if (server.ds_enabled) {
 #endif
     start = time(NULL);
     if (server.ds_enabled) {

-        redisLog(REDIS_NOTICE,"Running with disk back end");
+        redisLog(REDIS_NOTICE,"DB not loaded (running with disk back end)");

     } else if (server.appendonly) {
         if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
             redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start);
     } else if (server.appendonly) {
         if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
             redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start);