support for include directive in config parser

diff --git a/redis.c b/redis.c
index 1701f5eafa0f7c801df03226045204783a6feec2..ab0fc659a92b893a5e5220f2c29e1e3d9f229adc 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1701,6 +1701,8 @@ static void loadServerConfig(char *filename) {
             if (server.dbnum < 1) {
                 err = "Invalid number of databases"; goto loaderr;
             }
             if (server.dbnum < 1) {
                 err = "Invalid number of databases"; goto loaderr;
             }

+        } else if (!strcasecmp(argv[0],"include") && argc == 2) {
+            loadServerConfig(argv[1]);

         } else if (!strcasecmp(argv[0],"maxclients") && argc == 2) {
             server.maxclients = atoi(argv[1]);
         } else if (!strcasecmp(argv[0],"maxmemory") && argc == 2) {
         } else if (!strcasecmp(argv[0],"maxclients") && argc == 2) {
             server.maxclients = atoi(argv[1]);
         } else if (!strcasecmp(argv[0],"maxmemory") && argc == 2) {

diff --git a/redis.conf b/redis.conf
index 0ed593d2446f0a3222cf7c8bde8a3d3f931db186..fc5ac59d4db487d766a418e04055585b8caa6384 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -278,3 +278,13 @@ shareobjectspoolsize 1024
 # configuration directives.
 hash-max-zipmap-entries 64
 hash-max-zipmap-value 512
 # configuration directives.
 hash-max-zipmap-entries 64
 hash-max-zipmap-value 512

+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all redis server but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf