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

Merge branch 'keydbpro' into PRO_RELEASE_6

Browse Source 
Former-commit-id: 1dd55bec28e7bba38ff9fbd7c6b22b23b911a4eb
This commit is contained in:
John Sully 2020-04-14 01:01:20 -04:00
commit 2ecff6eccf
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();