fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-09 02:46:02 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2009-06-10 14:40:11 +02:00
parent 0df1ead745
commit c9a111acf4
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client-libraries/ruby/lib/redis.rb
View File

@ -154,7 +154,7 @@ class Redis
connect_to_server if !@sock connect_to_server if !@sock
begin begin
raw_call_command(argv.dup) raw_call_command(argv.dup)
rescue Errno::ECONNRESET rescue Errno::ECONNRESET, Errno::EPIPE
@sock.close @sock.close
connect_to_server connect_to_server
raw_call_command(argv.dup) raw_call_command(argv.dup)

19
redis.c
View File

@ -975,15 +975,20 @@ static int yesnotoi(char *s) {
/* I agree, this is a very rudimental way to load a configuration... /* I agree, this is a very rudimental way to load a configuration...
will improve later if the config gets more complex */ will improve later if the config gets more complex */
static void loadServerConfig(char *filename) { static void loadServerConfig(char *filename) {
FILE *fp = fopen(filename,"r"); FILE *fp;
char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL; char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL;
int linenum = 0; int linenum = 0;
sds line = NULL; sds line = NULL;
if (!fp) { 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"); redisLog(REDIS_WARNING,"Fatal error, can't open config file");
exit(1); exit(1);
} }
}
while(fgets(buf,REDIS_CONFIGLINE_MAX+1,fp) != NULL) { while(fgets(buf,REDIS_CONFIGLINE_MAX+1,fp) != NULL) {
sds *argv; sds *argv;
int argc, j; int argc, j;
@ -1037,7 +1042,7 @@ static void loadServerConfig(char *filename) {
goto loaderr; goto loaderr;
} }
} else if (!strcasecmp(argv[0],"logfile") && argc == 2) { } else if (!strcasecmp(argv[0],"logfile") && argc == 2) {
FILE *fp; FILE *logfp;
server.logfile = zstrdup(argv[1]); server.logfile = zstrdup(argv[1]);
if (!strcasecmp(server.logfile,"stdout")) { if (!strcasecmp(server.logfile,"stdout")) {
@ -1047,13 +1052,13 @@ static void loadServerConfig(char *filename) {
if (server.logfile) { if (server.logfile) {
/* Test if we are able to open the file. The server will not /* Test if we are able to open the file. The server will not
* be able to abort just for this problem later... */ * be able to abort just for this problem later... */
fp = fopen(server.logfile,"a"); logfp = fopen(server.logfile,"a");
if (fp == NULL) { if (logfp == NULL) {
err = sdscatprintf(sdsempty(), err = sdscatprintf(sdsempty(),
"Can't open the log file: %s", strerror(errno)); "Can't open the log file: %s", strerror(errno));
goto loaderr; goto loaderr;
} }
fclose(fp); fclose(logfp);
} }
} else if (!strcasecmp(argv[0],"databases") && argc == 2) { } else if (!strcasecmp(argv[0],"databases") && argc == 2) {
server.dbnum = atoi(argv[1]); server.dbnum = atoi(argv[1]);
@ -1099,7 +1104,7 @@ static void loadServerConfig(char *filename) {
zfree(argv); zfree(argv);
sdsfree(line); sdsfree(line);
} }
fclose(fp); if (fp != stdin) fclose(fp);
return; return;
loaderr: loaderr: