Changeset 604303c

Timestamp:

Aug 5, 2017, 11:21:53 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

e38f315

Parents:

1917e53

git-author:

Jason Gross <jgross@mit.edu> (08/03/17 16:01:11)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/05/17 23:21:53)

Message:

Give a bit more feedback when flushing logs

It's a bit hard to tell what's happening when :flush-logs gives no
feedback (though I think frequently the issue is that it just takes a
long time to write to disk).  This change displays how many logs there
are to be flushed, when the flushing fails.

File:

• logging.c (modified) (2 diffs)

logging.c

@@ -282 +282 @@
   bool drop_failed_logs = *(bool *)data;
   int ret;
-  bool logged_at_least_one_message = false;
+  int logged_message_count = 0;
   bool all_succeeded = true;
 
   defer_logs = false;
   while (!g_queue_is_empty(deferred_entry_queue) && !defer_logs) {
-    logged_at_least_one_message = true;
+    logged_message_count++;
     entry = (owl_log_entry*)g_queue_pop_head(deferred_entry_queue);
     if (!drop_failed_logs) {
@@ -304 +304 @@
     owl_log_entry_free(entry);
   }
-  if (all_succeeded && logged_at_least_one_message && !defer_logs) {
+  if (all_succeeded && logged_message_count > 0 && !defer_logs) {
     owl_log_adminmsg("Logs have been flushed and logging has resumed.");
+  } else if (!all_succeeded && logged_message_count > 0 && !defer_logs) {
+    owl_log_adminmsg("Logs have been flushed or dropped and logging has resumed.");
+  } else if (logged_message_count > 0 && defer_logs) {
+    owl_log_error("Attempted to flush %d logs; %u deferred logs remain.",
+                  logged_message_count, g_queue_get_length(deferred_entry_queue));
   }
 }