Merge pull request #5526 from valentino-redislabs/init-server-hz

fix short period of server.hz being uninitialised
This commit is contained in:
Salvatore Sanfilippo 2018-11-06 13:00:15 +01:00 committed by GitHub
commit e93387c1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1529,7 +1529,7 @@ void initServerConfig(void) {
server.timezone = getTimeZone(); /* Initialized by tzset(). */
server.configfile = NULL;
server.executable = NULL;
server.config_hz = CONFIG_DEFAULT_HZ;
server.hz = server.config_hz = CONFIG_DEFAULT_HZ;
server.dynamic_hz = CONFIG_DEFAULT_DYNAMIC_HZ;
server.arch_bits = (sizeof(long) == 8) ? 64 : 32;
server.port = CONFIG_DEFAULT_SERVER_PORT;