/* Function called at startup to load RDB or AOF file in memory. */
/* Function called at startup to load RDB or AOF file in memory. */
voidloadDataFromDisk(void){
voidloadDataFromDisk(void){
longlongstart=ustime();
longlongstart=ustime();
...
@@ -3766,6 +3777,11 @@ int main(int argc, char **argv) {
...
@@ -3766,6 +3777,11 @@ int main(int argc, char **argv) {
while(j!=argc){
while(j!=argc){
if(argv[j][0]=='-'&&argv[j][1]=='-'){
if(argv[j][0]=='-'&&argv[j][1]=='-'){
/* Option name */
/* Option name */
if(!strcmp(argv[j],"--check-rdb")){
/* Argument has no options, need to skip for parsing. */
j++;
continue;
}
if(sdslen(options))options=sdscat(options,"\n");
if(sdslen(options))options=sdscat(options,"\n");
options=sdscat(options,argv[j]+2);
options=sdscat(options,argv[j]+2);
options=sdscat(options," ");
options=sdscat(options," ");
...
@@ -3791,9 +3807,17 @@ int main(int argc, char **argv) {
...
@@ -3791,9 +3807,17 @@ int main(int argc, char **argv) {
redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf",argv[0],server.sentinel_mode?"sentinel":"redis");
redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf",argv[0],server.sentinel_mode?"sentinel":"redis");