From 4a799b6457140501daf20f372fe0fc05ee2a80e2 Mon Sep 17 00:00:00 2001
From: rebx <rebs.guarina@gmail.com>
Date: Wed, 18 Apr 2012 11:04:37 +1200
Subject: [PATCH] Create PID file even if in foreground

Previously, Redis only wrote the pid file if
it was daemonizing, but many times it's useful to have
the pid written out even if you're in the foreground.

Some background for this is:
I usually run redis via daemontools. That entails running
redis-server on the foreground. Given that, I'd also want
redis-server to create a pidfile so other processes (e.g. nagios)
can run checks for that.

Closes #463
---
 src/redis.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redis.c b/src/redis.c
index 7877c1c1844c..6291cddd6ddf 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -2331,7 +2331,7 @@ int prepareForShutdown(int flags) {
             return REDIS_ERR;
         }
     }
-    if (server.daemonize) {
+    if (server.daemonize || server.pidfile) {
         redisLog(REDIS_NOTICE,"Removing the pid file.");
         unlink(server.pidfile);
     }
@@ -3571,7 +3571,7 @@ int main(int argc, char **argv) {
     }
     if (server.daemonize) daemonize();
     initServer();
-    if (server.daemonize) createPidFile();
+    if (server.daemonize || server.pidfile) createPidFile();
     redisSetProcTitle(argv[0]);
     redisAsciiArt();