Warns if using the default config

diff --git a/TODO b/TODO
index 483d6fcb092719e230df68afa1c8d7cb28683c60..d762277d3ee2095033f3d2591f07961569f1e35b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,6 @@
 BEFORE REDIS 1.0.0-rc1
 
- * redis-cli should work on scripts too
  * Replication status in INFO command. role: (master|slave) slaveof: <host:port>, slavestatus: (disconnected|ok)
- * Warning if using default config, with hint about 'redis-server redis.conf'
  * Add number of keys for every DB in INFO
  * maxmemory support
  * maxclients support

diff --git a/redis.c b/redis.c
index a7c3f2114b92bc8ca371c2e202c6be2dff269654..2fdafc65c79f3bcb1710bf9724fb9c7809e4b841 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -4002,6 +4002,8 @@ int main(int argc, char **argv) {
     } else if (argc > 2) {
         fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n");
         exit(1);
+    } 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'");
     }
     initServer();
     if (server.daemonize) daemonize();