From 8c7a04d7476e06bf0c6158785040ae0f1d344a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Thu, 19 Dec 2019 15:51:30 +0100 Subject: [PATCH] Rename default pid file Former-commit-id: 3b60929bdc95f43901799042b302c713b520aee8 --- redis.conf | 6 +++--- src/server.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/redis.conf b/redis.conf index 2a10eabe5..6cd71ca89 100644 --- a/redis.conf +++ b/redis.conf @@ -132,7 +132,7 @@ tcp-keepalive 300 ################################# GENERAL ##################################### # By default Redis does not run as a daemon. Use 'yes' if you need it. -# 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/keydb.pid when daemonized. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -151,11 +151,11 @@ supervised no # # When the server runs non daemonized, no pid file is created if none is # specified in the configuration. When the server is daemonized, the pid file -# is used even if not specified, defaulting to "/var/run/redis.pid". +# is used even if not specified, defaulting to "/var/run/keydb.pid". # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -pidfile /var/run/redis_6379.pid +pidfile /var/run/keydb_6379.pid # Specify the server verbosity level. # This can be one of: diff --git a/src/server.h b/src/server.h index cd20bad3f..4480c69eb 100644 --- a/src/server.h +++ b/src/server.h @@ -264,7 +264,7 @@ public: #define CONFIG_DEFAULT_REPL_BACKLOG_TIME_LIMIT (60*60) /* 1 hour */ #define CONFIG_REPL_BACKLOG_MIN_SIZE (1024*16) /* 16k */ #define CONFIG_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */ -#define CONFIG_DEFAULT_PID_FILE "/var/run/redis.pid" +#define CONFIG_DEFAULT_PID_FILE "/var/run/keydb.pid" #define CONFIG_DEFAULT_SYSLOG_IDENT "redis" #define CONFIG_DEFAULT_CLUSTER_CONFIG_FILE "nodes.conf" #define CONFIG_DEFAULT_CLUSTER_ANNOUNCE_IP NULL /* Auto detect. */