upstream/redis
1
0
Fork 0
mirror of https://github.com/redis/redis.git synced 2026-02-03 20:39:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge b4aa8a3fde into b5a37c0e42

Browse source
This commit is contained in:
yoav-steinberg 2026-02-04 00:08:19 +08:00 committed by GitHub
commit 0412eef9b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/server.c
View file

@ -121,13 +121,23 @@ static inline int shouldShutdownAsap(void) {
/* Low level logging. To use only for very big messages, otherwise
* serverLog() is to prefer. */
#define ANSI_BLUE "\033[34m"
#define ANSI_MAGENTA "\033[35m"
#define ANSI_CYAN "\033[36m"
#define ANSI_RESET "\033[0m"
#define ANSI_RED_BOLD "\033[31;1m"
#define ANSI_GREEN_BOLD "\033[32;1m"
#define ANSI_YELLOW_BOLD "\033[33;1m"
#define ANSI_BOLD "\033[1m"
void serverLogRaw(int level, const char *msg) {
const int syslogLevelMap[] = { LOG_DEBUG, LOG_INFO, LOG_NOTICE, LOG_WARNING };
const char *c = ".-*#";
const char *level_color[] = {ANSI_RESET, ANSI_YELLOW_BOLD, ANSI_GREEN_BOLD, ANSI_RED_BOLD };
FILE *fp;
char buf[64];
int rawmode = (level & LL_RAW);
int log_to_stdout = server.logfile[0] == '\0';
static int stdout_isatty = -1;
level &= 0xff; /* clear flags */
if (level < server.verbosity) return;
@ -135,6 +145,9 @@ void serverLogRaw(int level, const char *msg) {
fp = log_to_stdout ? stdout : fopen(server.logfile,"a");
if (!fp) return;
if (log_to_stdout && stdout_isatty == -1)
stdout_isatty = isatty(fileno(fp));
if (rawmode) {
fprintf(fp,"%s",msg);
} else {
@ -157,8 +170,13 @@ void serverLogRaw(int level, const char *msg) {
} else {
role_char = (server.masterhost ? 'S':'M'); /* Slave or Master. */
}
fprintf(fp,"%d:%c %s %c %s\n",
(int)getpid(),role_char, buf,c[level],msg);
if (log_to_stdout && stdout_isatty) {
fprintf(fp, ANSI_CYAN"%d"ANSI_BLUE":"ANSI_MAGENTA"%c "ANSI_BLUE"%s %s%c "ANSI_RESET"%s%s\n"ANSI_RESET,
(int)getpid(), role_char, buf, level_color[level], c[level], level >= LL_WARNING ? ANSI_BOLD: "", msg);
} else {
fprintf(fp,"%d:%c %s %c %s\n",
(int)getpid(),role_char, buf, c[level], msg);
}
}
fflush(fp);