X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/5ef640986bc507079506bf77fd22ab31ea3f4fc4..bafa88c8b700b1648b561e86dce6ceca4c139d46:/src/debug.c diff --git a/src/debug.c b/src/debug.c index 88c88ca9..47d4c85d 100644 --- a/src/debug.c +++ b/src/debug.c @@ -201,7 +201,6 @@ void debugCommand(redisClient *c) { dictEntry *de = dictFind(c->db->dict,c->argv[2]->ptr); robj *val; char *strenc; - char *storage; if (!de) { addReply(c,shared.nokeyerr); @@ -209,19 +208,14 @@ void debugCommand(redisClient *c) { } val = dictGetEntryVal(de); strenc = strEncoding(val->encoding); - switch(val->storage) { - case REDIS_DS_MEMORY: storage = "memory"; break; - case REDIS_DS_DIRTY: storage = "dirty"; break; - case REDIS_DS_SAVING: storage = "saving"; break; - default: storage = "unknown"; break; - } + addReplyStatusFormat(c, "Value at:%p refcount:%d " "encoding:%s serializedlength:%lld " - "lru:%d lru_seconds_idle:%lu storage:%s", + "lru:%d lru_seconds_idle:%lu", (void*)val, val->refcount, strenc, (long long) rdbSavedObjectLen(val), - val->lru, estimateObjectIdleTime(val), storage); + val->lru, estimateObjectIdleTime(val)); } else if (!strcasecmp(c->argv[1]->ptr,"populate") && c->argc == 3) { long keys, j; robj *key, *val; @@ -268,10 +262,12 @@ void _redisAssert(char *estr, char *file, int line) { } void _redisPanic(char *msg, char *file, int line) { + redisLog(REDIS_WARNING,"------------------------------------------------"); redisLog(REDIS_WARNING,"!!! Software Failure. Press left mouse button to continue"); redisLog(REDIS_WARNING,"Guru Meditation: %s #%s:%d",msg,file,line); #ifdef HAVE_BACKTRACE redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)"); + redisLog(REDIS_WARNING,"------------------------------------------------"); *((char*)-1) = 'x'; #endif }