Allow to specify the pid file from the config file.

diff --git a/redis.c b/redis.c
index 04504eec201b01c12d171d589701b29d4dbce230..dae4e0af01fbd325331db70bbe165e9a69fbff4e 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -171,6 +171,7 @@ struct redisServer {
     int maxidletime;
     int dbnum;
     int daemonize;
     int maxidletime;
     int dbnum;
     int daemonize;

+    char *pidfile;

     int bgsaveinprogress;
     struct saveparam *saveparams;
     int saveparamslen;
     int bgsaveinprogress;
     struct saveparam *saveparams;
     int saveparamslen;


@@ -715,6 +716,7 @@ static void initServerConfig() {
     server.bindaddr = NULL;
     server.glueoutputbuf = 1;
     server.daemonize = 0;
     server.bindaddr = NULL;
     server.glueoutputbuf = 1;
     server.daemonize = 0;

+    server.pidfile = "/var/run/redis.pid";

     server.dbfilename = "dump.rdb";
     ResetServerSaveParams();
 
     server.dbfilename = "dump.rdb";
     ResetServerSaveParams();
 


@@ -878,6 +880,8 @@ static void loadServerConfig(char *filename) {
             else {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
             else {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }

+        } else if (!strcmp(argv[0],"pidfile") && argc == 2) {
+          server.pidfile = zstrdup(argv[1]);

         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }
         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }


@@ -1899,6 +1903,9 @@ static void bgsaveCommand(redisClient *c) {
 static void shutdownCommand(redisClient *c) {
     redisLog(REDIS_WARNING,"User requested shutdown, saving DB...");
     if (saveDb(server.dbfilename) == REDIS_OK) {
 static void shutdownCommand(redisClient *c) {
     redisLog(REDIS_WARNING,"User requested shutdown, saving DB...");
     if (saveDb(server.dbfilename) == REDIS_OK) {

+        if (server.daemonize) {
+          unlink(server.pidfile);
+        }

         redisLog(REDIS_WARNING,"Server exit now, bye bye...");
         exit(1);
     } else {
         redisLog(REDIS_WARNING,"Server exit now, bye bye...");
         exit(1);
     } else {


@@ -3033,7 +3040,7 @@ static void daemonize(void) {
         if (fd > STDERR_FILENO) close(fd);
     }
     /* Try to write the pid file */
         if (fd > STDERR_FILENO) close(fd);
     }
     /* Try to write the pid file */

-    fp = fopen("/var/run/redis.pid","w");
+    fp = fopen(server.pidfile,"w");

     if (fp) {
         fprintf(fp,"%d\n",getpid());
         fclose(fp);
     if (fp) {
         fprintf(fp,"%d\n",getpid());
         fclose(fp);

diff --git a/redis.conf b/redis.conf
index 19a9c64019dcdcbc95d16a992d892bafde801613..3727efd5907ae48b37d313a1f92f4188bfc8c5cb 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -4,6 +4,10 @@
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
 daemonize no
 
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
 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
 port 6379
 
 # Accept connections on the specified port, default is 6379
 port 6379