gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clusterLoadConfig() REDIS_ERR retval semantics refined.

Browse Source 
We should return REDIS_ERR to signal we can't read the configuration
because there is no config file only after checking errno, othewise
we risk to rewrite an existing file that was not accessible for some
other reason.
This commit is contained in:
antirez 2014-04-24 16:23:03 +02:00
parent 52668c900f
commit fe8ce2b064
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cluster.c
View File

@ -103,7 +103,16 @@ int clusterLoadConfig(char *filename) {
char *line; char *line;
int maxline, j; int maxline, j;
if (fp == NULL) return REDIS_ERR; if (fp == NULL) {
if (errno == ENOENT) {
return REDIS_ERR;
} else {
redisLog(REDIS_WARNING,
"Loading the cluster node config from %s: %s",
filename, strerror(errno));
exit(1);
}
}
/* Check if the file is zero-length: if so return REDIS_ERR to signal /* Check if the file is zero-length: if so return REDIS_ERR to signal
* we have to write the config. */ * we have to write the config. */