fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5769 from charsyam/feature/fix-segmentfault-when-server-starts

Browse Source 
fix segmentfault when server start in unstable branch
This commit is contained in:
Salvatore Sanfilippo 2019-01-11 11:27:09 +01:00 committed by GitHub
commit 6078d85b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.c
View File

@ -2185,7 +2185,6 @@ void initServer(void) {
if (server.cluster_enabled) clusterInit(); if (server.cluster_enabled) clusterInit();
replicationScriptCacheInit(); replicationScriptCacheInit();
scriptingInit(1); scriptingInit(1);
ACLInit();
slowlogInit(); slowlogInit();
latencyMonitorInit(); latencyMonitorInit();
bioInit(); bioInit();
@ -4023,6 +4022,9 @@ int main(int argc, char **argv) {
dictSetHashFunctionSeed((uint8_t*)hashseed); dictSetHashFunctionSeed((uint8_t*)hashseed);
server.sentinel_mode = checkForSentinelMode(argc,argv); server.sentinel_mode = checkForSentinelMode(argc,argv);
initServerConfig(); initServerConfig();
/* ACLInit should run before calling moduleInitModulesSystem */
ACLInit();
moduleInitModulesSystem(); moduleInitModulesSystem();
/* Store the executable path and arguments in a safe place in order /* Store the executable path and arguments in a safe place in order