slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disk store logged messages improved

Browse Source
This commit is contained in:
antirez 2010-12-29 23:08:18 +01:00
parent ddbc81af33
commit 67b0b41c87
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ release.h
src/transfer.sh src/transfer.sh
src/configs src/configs
src/redis-server.dSYM src/redis-server.dSYM
redis.ds

6
src/diskstore.c
View File

@ -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 */ /* File exists but it's not a directory */
if (retval == 0 && !S_ISDIR(sb.st_mode)) { 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 /* New disk store, create the directory structure now, as creating
* them in a lazy way is not a good idea, after very few insertions * them in a lazy way is not a good idea, after very few insertions
* we'll need most of the 65536 directories anyway. */ * 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) { if (mkdir(path,0755) == -1) {
redisLog(REDIS_WARNING,"Disk store init failed creating dir %s: %s", redisLog(REDIS_WARNING,"Disk store init failed creating dir %s: %s",
path, strerror(errno)); path, strerror(errno));

2
src/dscache.c
View File

@ -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 */ /* Open Disk Store */
if (dsOpen() != REDIS_OK) { if (dsOpen() != REDIS_OK) {
redisLog(REDIS_WARNING,"Fatal error opening disk store. Exiting."); redisLog(REDIS_WARNING,"Fatal error opening disk store. Exiting.");

2
src/redis.c
View File

@ -1494,7 +1494,7 @@ int main(int argc, char **argv) {
#endif #endif
start = time(NULL); start = time(NULL);
if (server.ds_enabled) { 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) { } else if (server.appendonly) {
if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK) if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start); redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start);