Commit f60c8c09 authored by antirez's avatar antirez
Browse files

Don't show the ASCII logo if syslog is enabled.

Closes issue #1935.
parent 04231cb7
...@@ -3107,15 +3107,27 @@ void redisAsciiArt(void) { ...@@ -3107,15 +3107,27 @@ void redisAsciiArt(void) {
if (server.sentinel_mode) mode = "sentinel"; if (server.sentinel_mode) mode = "sentinel";
snprintf(buf,1024*16,ascii_logo, if (server.syslog_enabled) {
REDIS_VERSION, redisLog(REDIS_NOTICE,
redisGitSHA1(), "Redis %s (%s/%d) %s bit, %s mode, port %d, pid %ld ready to start.",
strtol(redisGitDirty(),NULL,10) > 0, REDIS_VERSION,
(sizeof(long) == 8) ? "64" : "32", redisGitSHA1(),
mode, server.port, strtol(redisGitDirty(),NULL,10) > 0,
(long) getpid() (sizeof(long) == 8) ? "64" : "32",
); mode, server.port,
redisLogRaw(REDIS_NOTICE|REDIS_LOG_RAW,buf); (long) getpid()
);
} else {
snprintf(buf,1024*16,ascii_logo,
REDIS_VERSION,
redisGitSHA1(),
strtol(redisGitDirty(),NULL,10) > 0,
(sizeof(long) == 8) ? "64" : "32",
mode, server.port,
(long) getpid()
);
redisLogRaw(REDIS_NOTICE|REDIS_LOG_RAW,buf);
}
zfree(buf); zfree(buf);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment