fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix logStackTrace() when logging to stdout.

Browse Source 
When the semantics changed from logfile = NULL to logfile = "" to log
into standard output, no proper change was made to logStackTrace() to
make it able to work with the new setup.

This commit fixes the issue.
This commit is contained in:
antirez 2013-06-19 14:44:40 +02:00
parent 9c2c878e45
commit 338cd4835d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/debug.c
View File

@ -619,11 +619,12 @@ void logRegisters(ucontext_t *uc) {
void logStackTrace(ucontext_t *uc) { void logStackTrace(ucontext_t *uc) {
void *trace[100]; void *trace[100];
int trace_size = 0, fd; int trace_size = 0, fd;
int log_to_stdout = server.logfile[0] == '\0';
/* Open the log file in append mode. */ /* Open the log file in append mode. */
fd = server.logfile ? fd = log_to_stdout ?
open(server.logfile, O_APPEND|O_CREAT|O_WRONLY, 0644) : STDOUT_FILENO :
STDOUT_FILENO; open(server.logfile, O_APPEND|O_CREAT|O_WRONLY, 0644);
if (fd == -1) return; if (fd == -1) return;
/* Generate the stack trace */ /* Generate the stack trace */
@ -637,7 +638,7 @@ void logStackTrace(ucontext_t *uc) {
backtrace_symbols_fd(trace, trace_size, fd); backtrace_symbols_fd(trace, trace_size, fd);
/* Cleanup */ /* Cleanup */
if (server.logfile) close(fd); if (!log_to_stdout) close(fd);
} }
/* Log information about the "current" client, that is, the client that is /* Log information about the "current" client, that is, the client that is