gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'redis_6_merge' into keydbpro

Browse Source 
Former-commit-id: 8d8115ff59f5838e13e911416eff7dfe2c0d92dc
This commit is contained in:
John Sully 2020-04-06 01:25:15 -04:00
commit 23d75b45ec
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.cpp
View File

@ -5452,6 +5452,8 @@ void *workerThreadMain(void *parg)
static void validateConfiguration() static void validateConfiguration()
{ {
updateMasterAuth();
if (cserver.cthreads > (int)std::thread::hardware_concurrency()) { 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()); 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(); cserver.cthreads = (int)std::thread::hardware_concurrency();