gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syslog: enforce syslog identity and facility as soon as possible

Browse Source 
Former-commit-id: a9eaf0a130d3685c000d5f9cb500bb5f8cb8b263
This commit is contained in:
Maxime de Roucy 2021-08-31 00:02:39 +02:00 committed by Vivek Saini
parent 3078d08c04
commit d7efbd0c4e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.cpp
View File

@ -3498,11 +3498,6 @@ void initServer(void) {
selectDb(mi->cached_master, 0); 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->aof_state = g_pserver->aof_enabled ? AOF_ON : AOF_OFF;
g_pserver->hz = g_pserver->config_hz; g_pserver->hz = g_pserver->config_hz;
cserver.pid = getpid(); cserver.pid = getpid();
@ -6782,6 +6777,11 @@ int main(int argc, char **argv) {
sdsfree(options); 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) { if (cserver.fUsePro) {
const char *keydb_pro_dir = getenv("KEYDB_PRO_DIRECTORY"); const char *keydb_pro_dir = getenv("KEYDB_PRO_DIRECTORY");
sds path = sdsnew(keydb_pro_dir); sds path = sdsnew(keydb_pro_dir);