From d7efbd0c4e7d19c4e5303d201b80fd5cd1b9145b Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <maxime.deroucy@fr.clara.net>
Date: Tue, 31 Aug 2021 00:02:39 +0200
Subject: [PATCH] syslog: enforce syslog identity and facility as soon as
 possible

Former-commit-id: a9eaf0a130d3685c000d5f9cb500bb5f8cb8b263
---
 src/server.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server.cpp b/src/server.cpp
index 562935f9f..e507a8bfd 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3498,11 +3498,6 @@ void initServer(void) {
             selectDb(mi->cached_master, 0);
     }
 
-    if (g_pserver->syslog_enabled) {
-        openlog(g_pserver->syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT,
-            g_pserver->syslog_facility);
-    }
-
     g_pserver->aof_state = g_pserver->aof_enabled ? AOF_ON : AOF_OFF;
     g_pserver->hz = g_pserver->config_hz;
     cserver.pid = getpid();
@@ -6782,6 +6777,11 @@ int main(int argc, char **argv) {
         sdsfree(options);
     }
 
+    if (g_pserver->syslog_enabled) {
+        openlog(g_pserver->syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT,
+            g_pserver->syslog_facility);
+    }
+
     if (cserver.fUsePro) {
         const char *keydb_pro_dir = getenv("KEYDB_PRO_DIRECTORY");
         sds path = sdsnew(keydb_pro_dir);