X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/59d884af8c43a82a4f3d67c55059a7c453601d05..bb99f42596bb0f5c90416c54f6b9f1960cda71ed:/src/debug.c diff --git a/src/debug.c b/src/debug.c index 49c76824..37e6a1f7 100644 --- a/src/debug.c +++ b/src/debug.c @@ -105,7 +105,6 @@ void computeDatasetDigest(unsigned char *final) { mixDigest(digest,key,sdslen(key)); - /* Make sure the key is loaded if VM is active */ o = dictGetVal(de); aux = htonl(o->type); @@ -682,25 +681,16 @@ void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) { REDIS_NOTUSED(info); REDIS_NOTUSED(sig); sds st, log; - time_t now = time(NULL); - char date[128]; - FILE *fp; - fp = (server.logfile == NULL) ? stdout : fopen(server.logfile,"a"); - if (fp == NULL) return; - - strftime(date,sizeof(date),"%d %b %H:%M:%S",localtime(&now)); - log = sdscatprintf(sdsempty(), - "\n--- WATCHDOG TIMER EXPIRED (%s) ---\n",date); + log = sdsnew("\n--- WATCHDOG TIMER EXPIRED ---\n"); #ifdef HAVE_BACKTRACE st = getStackTrace(uc); #else st = sdsnew("Sorry: no support for backtrace().\n"); #endif log = sdscatsds(log,st); - log = sdscat(log,"------\n\n"); - fprintf(fp,"%s",log); - if (server.logfile) fclose(fp); + log = sdscat(log,"------\n"); + redisLogFromHandler(REDIS_WARNING,log); sdsfree(st); sdsfree(log); }