Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
723fb69b
Commit
723fb69b
authored
Mar 19, 2010
by
Antonio Ognio
Browse files
Solves issue #194 on Google Code: --help parameter to redis-srver prints the usage message
parent
c77169b7
Changes
1
Show whitespace changes
Inline
Side-by-side
redis.c
View file @
723fb69b
...
...
@@ -799,6 +799,8 @@ static struct redisCommand cmdTable[] = {
{
NULL
,
NULL
,
0
,
0
,
NULL
,
0
,
0
,
0
}
};
static
void
usage
();
/*============================ Utility functions ============================ */
/* Glob-style pattern matching. */
...
...
@@ -1614,12 +1616,15 @@ static void loadServerConfig(char *filename) {
char
buf
[
REDIS_CONFIGLINE_MAX
+
1
],
*
err
=
NULL
;
int
linenum
=
0
;
sds
line
=
NULL
;
char
*
errormsg
=
"Fatal error, can't open config file '%s'"
;
char
*
errorbuf
=
zmalloc
(
sizeof
(
char
)
*
(
strlen
(
errormsg
)
+
strlen
(
filename
)));
sprintf
(
errorbuf
,
errormsg
,
filename
);
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
,
errorbuf
);
exit
(
1
);
}
}
...
...
@@ -9122,16 +9127,23 @@ static void daemonize(void) {
}
}
static
void
usage
()
{
fprintf
(
stderr
,
"Usage: ./redis-server [/path/to/redis.conf]
\n
"
);
exit
(
1
);
}
int
main
(
int
argc
,
char
**
argv
)
{
time_t
start
;
initServerConfig
();
if
(
argc
==
2
)
{
if
(
strcmp
(
argv
[
1
],
"--help"
)
==
0
)
{
usage
();
}
resetServerSaveParams
();
loadServerConfig
(
argv
[
1
]);
}
else
if
(
argc
>
2
)
{
fprintf
(
stderr
,
"Usage: ./redis-server [/path/to/redis.conf]
\n
"
);
exit
(
1
);
}
else
if
((
argc
>
2
))
{
usage
();
}
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'"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment