Use Parms.cpp to set upper limit on m_pingSpacer

The lower bound was already done in Parms.cpp so the upper bound in PingServer.cpp was probably just nonupdated code.
This commit is contained in:
Ivan Skytte Jørgensen
2017-03-31 15:38:27 +02:00
parent 44bf13d68f
commit d7a2e93ec6
3 changed files with 2 additions and 6 deletions

@ -82,7 +82,7 @@ Conf::Conf ( ) {
m_maxJobCleanupTime = 0;
m_deadHostTimeout = 0;
m_sendEmailTimeout = 0;
m_pingSpacer = 0;
m_pingSpacer = 100;
m_maxDocsWanted = 0;
m_maxFirstResultNum = 0;
min_docid_splits = 0;

@ -5248,6 +5248,7 @@ void Parms::init ( ) {
m->m_cgi = "ps";
simple_m_set(Conf,m_pingSpacer);
m->m_min = 50; // i've seen values of 0 hammer the cpu
m->m_max = 1000;
m->m_def = "100";
m->m_units = "milliseconds";
m->m_group = false;

@ -57,11 +57,6 @@ bool PingServer::registerHandler ( ) {
return false;
}
// limit this to 1000ms
if ( g_conf.m_pingSpacer > 1000 ) {
g_conf.m_pingSpacer = 1000;
}
// save this
m_pingSpacer = g_conf.m_pingSpacer;