Skip to content

Commit 5e8b7e4

Browse files
committed
Define default pidfile when creating pid
We want pidfile to be NULL on startup so we can detect if the user set an explicit value versus only using the default value. Closes redis#1967 Fixes redis#2076
1 parent e6d499a commit 5e8b7e4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/redis.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,7 @@ void initServerConfig(void) {
14331433
server.aof_flush_postponed_start = 0;
14341434
server.aof_rewrite_incremental_fsync = REDIS_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC;
14351435
server.aof_load_truncated = REDIS_DEFAULT_AOF_LOAD_TRUNCATED;
1436-
server.pidfile = zstrdup(REDIS_DEFAULT_PID_FILE);
1436+
server.pidfile = NULL;
14371437
server.rdb_filename = zstrdup(REDIS_DEFAULT_RDB_FILENAME);
14381438
server.aof_filename = zstrdup(REDIS_DEFAULT_AOF_FILENAME);
14391439
server.requirepass = NULL;
@@ -3393,6 +3393,10 @@ void linuxMemoryWarnings(void) {
33933393
#endif /* __linux__ */
33943394

33953395
void createPidFile(void) {
3396+
/* If pidfile requested, but no pidfile defined, use
3397+
* default pidfile path */
3398+
if (!server.pidfile) server.pidfile = zstrdup(REDIS_DEFAULT_PID_FILE);
3399+
33963400
/* Try to write the pid file in a best-effort way. */
33973401
FILE *fp = fopen(server.pidfile,"w");
33983402
if (fp) {

0 commit comments

Comments
 (0)