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

Allow to specify the pid file from the config file.

Browse Source
This commit is contained in:
Luc Heinrich 2009-03-23 12:31:33 +01:00
parent db52edaa0d
commit ed329fcf25
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redis.c
View File

@ -171,6 +171,7 @@ struct redisServer {
int maxidletime; int maxidletime;
int dbnum; int dbnum;
int daemonize; int daemonize;
char *pidfile;
int bgsaveinprogress; int bgsaveinprogress;
struct saveparam *saveparams; struct saveparam *saveparams;
int saveparamslen; int saveparamslen;
@ -715,6 +716,7 @@ static void initServerConfig() {
server.bindaddr = NULL; server.bindaddr = NULL;
server.glueoutputbuf = 1; server.glueoutputbuf = 1;
server.daemonize = 0; server.daemonize = 0;
server.pidfile = "/var/run/redis.pid";
server.dbfilename = "dump.rdb"; server.dbfilename = "dump.rdb";
ResetServerSaveParams(); ResetServerSaveParams();
@ -878,6 +880,8 @@ static void loadServerConfig(char *filename) {
else { else {
err = "argument must be 'yes' or 'no'"; goto loaderr; err = "argument must be 'yes' or 'no'"; goto loaderr;
} }
} else if (!strcmp(argv[0],"pidfile") && argc == 2) {
server.pidfile = zstrdup(argv[1]);
} else { } else {
err = "Bad directive or wrong number of arguments"; goto loaderr; err = "Bad directive or wrong number of arguments"; goto loaderr;
} }
@ -1899,6 +1903,9 @@ static void bgsaveCommand(redisClient *c) {
static void shutdownCommand(redisClient *c) { static void shutdownCommand(redisClient *c) {
redisLog(REDIS_WARNING,"User requested shutdown, saving DB..."); redisLog(REDIS_WARNING,"User requested shutdown, saving DB...");
if (saveDb(server.dbfilename) == REDIS_OK) { if (saveDb(server.dbfilename) == REDIS_OK) {
if (server.daemonize) {
unlink(server.pidfile);
}
redisLog(REDIS_WARNING,"Server exit now, bye bye..."); redisLog(REDIS_WARNING,"Server exit now, bye bye...");
exit(1); exit(1);
} else { } else {
@ -3033,7 +3040,7 @@ static void daemonize(void) {
if (fd > STDERR_FILENO) close(fd); if (fd > STDERR_FILENO) close(fd);
} }
/* Try to write the pid file */ /* Try to write the pid file */
fp = fopen("/var/run/redis.pid","w"); fp = fopen(server.pidfile,"w");
if (fp) { if (fp) {
fprintf(fp,"%d\n",getpid()); fprintf(fp,"%d\n",getpid());
fclose(fp); fclose(fp);

4
redis.conf
View File

@ -4,6 +4,10 @@
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
daemonize no daemonize no
# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
# You can specify a custom pid file location here.
pidfile /var/run/redis.pid
# Accept connections on the specified port, default is 6379 # Accept connections on the specified port, default is 6379
port 6379 port 6379