disk store logged messages improved

diff --git a/.gitignore b/.gitignore
index 90c9462166fb18cf0b778e99bf8dbcbb57b0620b..8adcafab52354c040700df82ec4faad82dcc8e19 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ release.h
 src/transfer.sh
 src/configs
 src/redis-server.dSYM
 src/transfer.sh
 src/configs
 src/redis-server.dSYM

+redis.ds

diff --git a/src/diskstore.c b/src/diskstore.c
index cfb8ae66040d9d2d6bbe0e6b68130e49ed0b75b2..043adc4b0875338930a9d469c246af647c107ad2 100644 (file)
--- a/src/diskstore.c
+++ b/src/diskstore.c
@@ -102,7 +102,10 @@ int dsOpen(void) {
     }
 
     /* Directory already in place. Assume everything is ok. */
     }
 
     /* Directory already in place. Assume everything is ok. */

-    if (retval == 0 && S_ISDIR(sb.st_mode)) return REDIS_OK;
+    if (retval == 0 && S_ISDIR(sb.st_mode)) {
+        redisLog(REDIS_NOTICE,"Disk store %s exists", path);
+        return REDIS_OK;
+    }

 
     /* File exists but it's not a directory */
     if (retval == 0 && !S_ISDIR(sb.st_mode)) {
 
     /* File exists but it's not a directory */
     if (retval == 0 && !S_ISDIR(sb.st_mode)) {


@@ -113,6 +116,7 @@ int dsOpen(void) {
     /* New disk store, create the directory structure now, as creating
      * them in a lazy way is not a good idea, after very few insertions
      * we'll need most of the 65536 directories anyway. */
     /* New disk store, create the directory structure now, as creating
      * them in a lazy way is not a good idea, after very few insertions
      * we'll need most of the 65536 directories anyway. */

+    redisLog(REDIS_NOTICE,"Disk store %s does not exist: creating", path);

     if (mkdir(path,0755) == -1) {
         redisLog(REDIS_WARNING,"Disk store init failed creating dir %s: %s",
             path, strerror(errno));
     if (mkdir(path,0755) == -1) {
         redisLog(REDIS_WARNING,"Disk store init failed creating dir %s: %s",
             path, strerror(errno));

diff --git a/src/dscache.c b/src/dscache.c
index 24d485fb25680db5d10d243592d70b28d1e876a9..7273f7ffd6decf7fa58cc39daf966e24beb4b4e0 100644 (file)
--- a/src/dscache.c
+++ b/src/dscache.c
@@ -117,7 +117,7 @@ void dsInit(void) {
 
     zmalloc_enable_thread_safeness(); /* we need thread safe zmalloc() */
 
 
     zmalloc_enable_thread_safeness(); /* we need thread safe zmalloc() */
 

-    redisLog(REDIS_NOTICE,"Initializing Disk Store at %s", server.ds_path);
+    redisLog(REDIS_NOTICE,"Opening Disk Store: %s", server.ds_path);

     /* Open Disk Store */
     if (dsOpen() != REDIS_OK) {
         redisLog(REDIS_WARNING,"Fatal error opening disk store. Exiting.");
     /* Open Disk Store */
     if (dsOpen() != REDIS_OK) {
         redisLog(REDIS_WARNING,"Fatal error opening disk store. Exiting.");

diff --git a/src/redis.c b/src/redis.c
index 652d18ca41e994b6e6133d06cf2b6ae3559de7e3..2ca37a3b92a10c0bcf3a2a68775f90f55dbf7721 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1494,7 +1494,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);