It is now possible to specify - as config file name to read it from stdin

diff --git a/client-libraries/ruby/lib/redis.rb b/client-libraries/ruby/lib/redis.rb
index 9181314dbf45b36649f300f854ec50c675b1cdc1..4138e9c59bce4120fbc78c0fe4227e8ae42b3306 100644 (file)
--- a/client-libraries/ruby/lib/redis.rb
+++ b/client-libraries/ruby/lib/redis.rb
@@ -154,7 +154,7 @@ class Redis
     connect_to_server if !@sock
     begin
       raw_call_command(argv.dup)
     connect_to_server if !@sock
     begin
       raw_call_command(argv.dup)

-    rescue Errno::ECONNRESET
+    rescue Errno::ECONNRESET, Errno::EPIPE

       @sock.close
       connect_to_server
       raw_call_command(argv.dup)
       @sock.close
       connect_to_server
       raw_call_command(argv.dup)

diff --git a/redis.c b/redis.c
index 17100a8de637572f88659f106166e3f83d53d01e..bcc8e5dc13a0e94ddf08a1f350594ec7e97cbc96 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -975,15 +975,20 @@ static int yesnotoi(char *s) {
 /* I agree, this is a very rudimental way to load a configuration...
    will improve later if the config gets more complex */
 static void loadServerConfig(char *filename) {
 /* I agree, this is a very rudimental way to load a configuration...
    will improve later if the config gets more complex */
 static void loadServerConfig(char *filename) {

-    FILE *fp = fopen(filename,"r");
+    FILE *fp;

     char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL;
     int linenum = 0;
     sds line = NULL;
     char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL;
     int linenum = 0;
     sds line = NULL;

-    
-    if (!fp) {
-        redisLog(REDIS_WARNING,"Fatal error, can't open config file");
-        exit(1);
+
+    if (filename[0] == '-' && filename[1] == '\0')
+        fp = stdin;
+    else {
+        if ((fp = fopen(filename,"r")) == NULL) {
+            redisLog(REDIS_WARNING,"Fatal error, can't open config file");
+            exit(1);
+        }

     }
     }

+

     while(fgets(buf,REDIS_CONFIGLINE_MAX+1,fp) != NULL) {
         sds *argv;
         int argc, j;
     while(fgets(buf,REDIS_CONFIGLINE_MAX+1,fp) != NULL) {
         sds *argv;
         int argc, j;


@@ -1037,7 +1042,7 @@ static void loadServerConfig(char *filename) {
                 goto loaderr;
             }
         } else if (!strcasecmp(argv[0],"logfile") && argc == 2) {
                 goto loaderr;
             }
         } else if (!strcasecmp(argv[0],"logfile") && argc == 2) {

-            FILE *fp;
+            FILE *logfp;

 
             server.logfile = zstrdup(argv[1]);
             if (!strcasecmp(server.logfile,"stdout")) {
 
             server.logfile = zstrdup(argv[1]);
             if (!strcasecmp(server.logfile,"stdout")) {


@@ -1047,13 +1052,13 @@ static void loadServerConfig(char *filename) {
             if (server.logfile) {
                 /* Test if we are able to open the file. The server will not
                  * be able to abort just for this problem later... */
             if (server.logfile) {
                 /* Test if we are able to open the file. The server will not
                  * be able to abort just for this problem later... */

-                fp = fopen(server.logfile,"a");
-                if (fp == NULL) {
+                logfp = fopen(server.logfile,"a");
+                if (logfp == NULL) {

                     err = sdscatprintf(sdsempty(),
                         "Can't open the log file: %s", strerror(errno));
                     goto loaderr;
                 }
                     err = sdscatprintf(sdsempty(),
                         "Can't open the log file: %s", strerror(errno));
                     goto loaderr;
                 }

-                fclose(fp);
+                fclose(logfp);

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


@@ -1099,7 +1104,7 @@ static void loadServerConfig(char *filename) {
         zfree(argv);
         sdsfree(line);
     }
         zfree(argv);
         sdsfree(line);
     }

-    fclose(fp);
+    if (fp != stdin) fclose(fp);

     return;
 
 loaderr:
     return;
 
 loaderr: