Changeset edb14cc for logging.c

Timestamp:

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

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

874fd19

Parents:

9d6e37c

git-author:

Jason Gross <jgross@mit.edu> (01/01/14 11:23:17)

git-committer:

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

Message:

Let the user know when the logs have been flushed

I've found it a bit disconcerting to have no feedback on whether or not
:flush-logs has succeeded, and on whether or not we're still in deferred
logging mode.  Perhaps a message (owl_function_makemsg with no newline)
would be better than adminmsg here, but I'm not sure.

File:

• logging.c (modified) (4 diffs)

logging.c

@@ -153 +153 @@
 }
 
+static void owl_log_adminmsg_main_thread(gpointer data)
+{
+  owl_function_adminmsg("Logging", (const char*)data);
+}
+
 static void G_GNUC_PRINTF(1, 2) owl_log_error(const char *fmt, ...)
 {
@@ -163 +168 @@
 
   owl_select_post_task(owl_log_error_main_thread,
+                       data, g_free, g_main_context_default());
+}
+
+static void G_GNUC_PRINTF(1, 2) owl_log_adminmsg(const char *fmt, ...)
+{
+  va_list ap;
+  char *data;
+
+  va_start(ap, fmt);
+  data = g_strdup_vprintf(fmt, ap);
+  va_end(ap);
+
+  owl_select_post_task(owl_log_adminmsg_main_thread,
                        data, g_free, g_main_context_default());
 }
@@ -254 +272 @@
   bool drop_failed_logs = *(bool *)data;
   int ret;
+  bool logged_at_least_one_message = false;
+  bool all_succeeded = true;
 
   defer_logs = false;
   while (!g_queue_is_empty(deferred_entry_queue) && !defer_logs) {
+    logged_at_least_one_message = true;
     entry = (owl_log_entry*)g_queue_pop_head(deferred_entry_queue);
     if (drop_failed_logs) {
@@ -263 +284 @@
       ret = owl_log_try_write_entry(entry);
       if (ret != 0) {
+        all_succeeded = false;
         owl_log_file_error(entry, ret);
       }
     }
     owl_log_entry_free(entry);
+  }
+  if (all_succeeded && logged_at_least_one_message) {
+    owl_log_adminmsg("Logs have been flushed and logging has resumed.");
   }
 }