mxqd: Reduce logging at log level info in main loop

mariux64 · Jul 6, 2017 · 6a15b2b · 6a15b2b
1 parent 447cc7f
commit 6a15b2b
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/mxqd.c b/mxqd.c
@@ -2401,8 +2401,7 @@ int main(int argc, char *argv[])
     if (server->recoveronly)
         fail = 1;
 
-    server_dump(server);
-
+    mx_log_info("entering main loop");
     while (!global_sigint_cnt && !global_sigterm_cnt && !global_sigquit_cnt && !global_sigrestart_cnt && !fail) {
         mx_log_debug("main loop - wait for signals max %ld sec",poll_interval.tv_sec);
         res=sigtimedwait(&all_signals,&siginfo,&poll_interval);
@@ -2415,11 +2414,6 @@ int main(int argc, char *argv[])
         if (slots_returned)
             mx_log_info("slots_returned=%lu :: Main Loop freed %lu slots.", slots_returned, slots_returned);
 
-        if (slots_started || slots_returned) {
-            server_dump(server);
-            slots_started = 0;
-        }
-
         group_cnt = load_running_groups(server);
         if (group_cnt)
            mx_log_debug("group_cnt=%d :: %d Groups loaded", group_cnt, group_cnt);
@@ -2432,7 +2426,7 @@ int main(int argc, char *argv[])
             assert(!server->jobs_running);
             assert(!group_cnt);
             mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_IDLE);
-            mx_log_info("Nothing to do. Sleeping for a short while. (1 second)");
+            mx_log_debug("Nothing to do");
             poll_interval.tv_sec=1;
             continue;
         }
@@ -2445,15 +2439,15 @@ int main(int argc, char *argv[])
             } else {
                 mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_FULL);
             }
-            mx_log_info("All slots running. Sleeping for a short while (7 seconds).");
+            mx_log_debug("All slots running");
             poll_interval.tv_sec=7;
             continue;
         }
 
         slots_started = start_user_with_least_running_global_slot_count(server);
         if (slots_started == -1) {
             mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_WAITING);
-            mx_log_info("no slots_started => we have users waiting for free slots. Sleeping (3 seconds).");
+            mx_log_info("no slots_started => we have users waiting for free slots");
             slots_started = 0;
             poll_interval.tv_sec=3;
             continue;
@@ -2464,11 +2458,11 @@ int main(int argc, char *argv[])
         if (!slots_started && !slots_returned && !global_sigint_cnt && !global_sigterm_cnt) {
             if (!server->jobs_running) {
                 mxq_daemon_set_status(server->mysql, daemon, MXQ_DAEMON_STATUS_IDLE);
-                mx_log_info("Tried Hard and nobody is doing anything. Sleeping for a long while (15 seconds).");
+                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_info("Tried Hard. But have done nothing. Sleeping for a very short while (3 seconds).");
+                mx_log_debug("Tried Hard. But have done nothing.");
                 poll_interval.tv_sec=3;
             }
             continue;