mirror of
https://codeberg.org/redict/redict.git
synced 2025-01-23 08:38:27 -05:00
Merge branch 'issue_191' of git://github.com/gnrfan/redis
This commit is contained in:
commit
5e2022bb48
10
redis.c
10
redis.c
@ -1102,6 +1102,8 @@ static dictType keylistDictType = {
|
|||||||
dictListDestructor /* val destructor */
|
dictListDestructor /* val destructor */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void version();
|
||||||
|
|
||||||
/* ========================= Random utility functions ======================= */
|
/* ========================= Random utility functions ======================= */
|
||||||
|
|
||||||
/* Redis generally does not try to recover from out of memory conditions
|
/* Redis generally does not try to recover from out of memory conditions
|
||||||
@ -9158,11 +9160,19 @@ static void daemonize(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void version() {
|
||||||
|
printf("Redis server version %s\n", REDIS_VERSION);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
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)) {
|
||||||
|
version();
|
||||||
|
}
|
||||||
resetServerSaveParams();
|
resetServerSaveParams();
|
||||||
loadServerConfig(argv[1]);
|
loadServerConfig(argv[1]);
|
||||||
} else if (argc > 2) {
|
} else if (argc > 2) {
|
||||||
|
Loading…
Reference in New Issue
Block a user