Fix not respecting max clients config, issue #147
Former-commit-id: 54c96d19954fbddcfd2a307e436ca3290c76e0fb
This commit is contained in:
parent
67d78e7808
commit
f2c68909dc
@ -5121,10 +5121,6 @@ int main(int argc, char **argv) {
|
|||||||
dictSetHashFunctionSeed((uint8_t*)hashseed);
|
dictSetHashFunctionSeed((uint8_t*)hashseed);
|
||||||
g_pserver->sentinel_mode = checkForSentinelMode(argc,argv);
|
g_pserver->sentinel_mode = checkForSentinelMode(argc,argv);
|
||||||
initServerConfig();
|
initServerConfig();
|
||||||
for (int iel = 0; iel < MAX_EVENT_LOOPS; ++iel)
|
|
||||||
{
|
|
||||||
initServerThread(g_pserver->rgthreadvar+iel, iel == IDX_EVENT_LOOP_MAIN);
|
|
||||||
}
|
|
||||||
serverTL = &g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN];
|
serverTL = &g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN];
|
||||||
aeAcquireLock(); // We own the lock on boot
|
aeAcquireLock(); // We own the lock on boot
|
||||||
|
|
||||||
@ -5251,6 +5247,10 @@ int main(int argc, char **argv) {
|
|||||||
int background = cserver.daemonize && !cserver.supervised;
|
int background = cserver.daemonize && !cserver.supervised;
|
||||||
if (background) daemonize();
|
if (background) daemonize();
|
||||||
|
|
||||||
|
for (int iel = 0; iel < MAX_EVENT_LOOPS; ++iel)
|
||||||
|
{
|
||||||
|
initServerThread(g_pserver->rgthreadvar+iel, iel == IDX_EVENT_LOOP_MAIN);
|
||||||
|
}
|
||||||
initServer();
|
initServer();
|
||||||
initNetworking(cserver.cthreads > 1 /* fReusePort */);
|
initNetworking(cserver.cthreads > 1 /* fReusePort */);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user