Commit 42c57186 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #603 from mrb/fix_sentinel_config_warning

Fix warning in redis.c for sentinel config load
parents 7c15dd15 f1c8661e
...@@ -2596,7 +2596,7 @@ int main(int argc, char **argv) { ...@@ -2596,7 +2596,7 @@ int main(int argc, char **argv) {
loadServerConfig(configfile,options); loadServerConfig(configfile,options);
sdsfree(options); sdsfree(options);
} else { } else {
redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use 'redis-server /path/to/redis.conf'"); redisLog(REDIS_WARNING, "Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf", argv[0], server.sentinel_mode ? "sentinel" : "redis");
} }
if (server.daemonize) daemonize(); if (server.daemonize) daemonize();
initServer(); initServer();
......
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