New INFO field aof_delayed_fsync introduced.

[redis.git] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index fe21531ba51ad35a673871d4ba7835bda58a9f3e..8eea3bf8d0472d23b38c1b394108b20fc2f3d3c5 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -314,8 +314,8 @@ void _redisAssert(char *estr, char *file, int line) {
     server.assert_file = file;
     server.assert_line = line;
     redisLog(REDIS_WARNING,"(forcing SIGSEGV to print the bug report.)");
     server.assert_file = file;
     server.assert_line = line;
     redisLog(REDIS_WARNING,"(forcing SIGSEGV to print the bug report.)");

-    *((char*)-1) = 'x';

 #endif
 #endif

+    *((char*)-1) = 'x';

 }
 
 void _redisAssertPrintClientInfo(redisClient *c) {
 }
 
 void _redisAssertPrintClientInfo(redisClient *c) {


@@ -384,9 +384,9 @@ void _redisPanic(char *msg, char *file, int line) {
     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,"Guru Meditation: %s #%s:%d",msg,file,line);
 #ifdef HAVE_BACKTRACE
     redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)");

+#endif

     redisLog(REDIS_WARNING,"------------------------------------------------");
     *((char*)-1) = 'x';
     redisLog(REDIS_WARNING,"------------------------------------------------");
     *((char*)-1) = 'x';

-#endif

 }
 
 void bugReportStart(void) {
 }
 
 void bugReportStart(void) {


@@ -636,8 +636,9 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
 
     redisLog(REDIS_WARNING,
 "\n=== REDIS BUG REPORT END. Make sure to include from START to END. ===\n\n"
 
     redisLog(REDIS_WARNING,
 "\n=== REDIS BUG REPORT END. Make sure to include from START to END. ===\n\n"

-"    Please report the crash opening an issue on github:\n\n"
-"        http://github.com/antirez/redis/issues\n\n"
+"       Please report the crash opening an issue on github:\n\n"
+"           http://github.com/antirez/redis/issues\n\n"
+"  Suspect RAM error? Use redis-server --test-memory to veryfy it.\n\n"

 );
     /* free(messages); Don't call free() with possibly corrupted memory. */
     if (server.daemonize) unlink(server.pidfile);
 );
     /* free(messages); Don't call free() with possibly corrupted memory. */
     if (server.daemonize) unlink(server.pidfile);