From 67b0b41c879d01a35b1fcdab88b7e70f95a3232c Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Wed, 29 Dec 2010 23:08:18 +0100
Subject: [PATCH] disk store logged messages improved
---
.gitignore | 1 +
src/diskstore.c | 6 +++++-
src/dscache.c | 2 +-
src/redis.c | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 90c94621..8adcafab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ release.h
src/transfer.sh
src/configs
src/redis-server.dSYM
+redis.ds
diff --git a/src/diskstore.c b/src/diskstore.c
index cfb8ae66..043adc4b 100644
--- a/src/diskstore.c
+++ b/src/diskstore.c
@@ -102,7 +102,10 @@ int dsOpen(void) {
}
/* 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)) {
@@ -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. */
+ 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));
diff --git a/src/dscache.c b/src/dscache.c
index 24d485fb..7273f7ff 100644
--- a/src/dscache.c
+++ b/src/dscache.c
@@ -117,7 +117,7 @@ void dsInit(void) {
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.");
diff --git a/src/redis.c b/src/redis.c
index 652d18ca..2ca37a3b 100644
--- 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) {
- 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);