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

Fix failure to AUTH with master when masterauth is set last

Browse Source 
Former-commit-id: 3fdc8608f35b9e333a1c789b039d16722a6ceef5
This commit is contained in:
John Sully 2020-04-06 01:24:59 -04:00
parent 38d16ea581
commit a0447f23ac
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

@ -5188,6 +5188,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();