1
0
mirror of https://github.com/fluencelabs/redis synced 2025-07-24 21:11:56 +00:00

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

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

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