diff --git a/mxqd.c b/mxqd.c index ce78837d..3d8cbf49 100644 --- a/mxqd.c +++ b/mxqd.c @@ -2338,7 +2338,7 @@ int main(int argc, char *argv[]) int res; int fail = 0; - struct timespec poll_interval={0,0}; + static struct timespec poll_interval={10,0}; /* 10 seconds */ siginfo_t siginfo; int saved_argc; @@ -2427,7 +2427,6 @@ int main(int argc, char *argv[]) assert(!group_cnt); mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_IDLE); mx_log_debug("Nothing to do"); - poll_interval.tv_sec=1; continue; } @@ -2440,7 +2439,6 @@ int main(int argc, char *argv[]) mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_FULL); } mx_log_debug("All slots running"); - poll_interval.tv_sec=7; continue; } @@ -2456,7 +2454,6 @@ int main(int argc, char *argv[]) if (res<0) { mx_log_info("No more slots started because we have users waiting for free slots"); mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_WAITING); - poll_interval.tv_sec=3; continue; } @@ -2464,11 +2461,9 @@ int main(int argc, char *argv[]) if (!server->jobs_running) { mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_IDLE); mx_log_debug("Tried Hard and nobody is doing anything."); - poll_interval.tv_sec=15; } else { mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_RUNNING); mx_log_debug("Tried Hard. But have done nothing."); - poll_interval.tv_sec=3; } continue; } @@ -2484,7 +2479,6 @@ int main(int argc, char *argv[]) /* while not quitting and not restarting -> wait for and collect all running jobs */ mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_TERMINATING); - poll_interval.tv_sec=1; while (server->jobs_running && !global_sigquit_cnt && !global_sigrestart_cnt && !fail) { slots_returned = catchall(server); slots_returned += fspool_scan(server);