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

Merged gnrfan patches fixing issues 191, 193, 194

Browse Source
This commit is contained in:
antirez 2010-03-22 17:31:46 +01:00
commit 44efe66ef2
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
redis.c
View File

@ -799,6 +799,8 @@ static struct redisCommand cmdTable[] = {
{NULL,NULL,0,0,NULL,0,0,0} {NULL,NULL,0,0,NULL,0,0,0}
}; };
static void usage();
/*============================ Utility functions ============================ */ /*============================ Utility functions ============================ */
/* Glob-style pattern matching. */ /* Glob-style pattern matching. */
@ -9168,19 +9170,23 @@ static void version() {
exit(0); exit(0);
} }
static void usage() {
fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n");
exit(1);
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
time_t start; time_t start;
initServerConfig(); initServerConfig();
if (argc == 2) { if (argc == 2) {
if ((strcmp(argv[1], "-v") == 0) || (strcmp(argv[1], "--version") == 0)) { if (strcmp(argv[1], "-v") == 0 ||
version(); strcmp(argv[1], "--version") == 0) version();
} if (strcmp(argv[1], "--help") == 0) usage();
resetServerSaveParams(); resetServerSaveParams();
loadServerConfig(argv[1]); loadServerConfig(argv[1]);
} else if (argc > 2) { } else if ((argc > 2)) {
fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf]\n"); usage();
exit(1);
} else { } else {
redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use 'redis-server /path/to/redis.conf'"); redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use 'redis-server /path/to/redis.conf'");
} }