Merge branch 'redis_6_merge' into keydbpro

Former-commit-id: 8d8115ff59f5838e13e911416eff7dfe2c0d92dc
2020-04-06 01:25:15 -04:00 · 2020-04-06 01:25:15 -04:00 · 23d75b45ec
commit 23d75b45ec
parent f5ab6801be 945f40c76a
1 changed files with 2 additions and 0 deletions
--- a/src/server.cpp
+++ b/src/server.cpp
@ -5452,6 +5452,8 @@ void *workerThreadMain(void *parg)

 static void validateConfiguration()
 {
+    updateMasterAuth();
+    
    if (cserver.cthreads > (int)std::thread::hardware_concurrency()) {
        serverLog(LL_WARNING, "WARNING: server-threads is greater than this machine's core count.  Truncating to %u threads", std::thread::hardware_concurrency());
        cserver.cthreads = (int)std::thread::hardware_concurrency();