Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
6078d85b
Unverified
Commit
6078d85b
authored
Jan 11, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 11, 2019
Browse files
Merge pull request #5769 from charsyam/feature/fix-segmentfault-when-server-starts
fix segmentfault when server start in unstable branch
parents
4b72d087
45952df7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
6078d85b
...
@@ -2185,7 +2185,6 @@ void initServer(void) {
...
@@ -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) {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment