Changeset 77beb3c

Timestamp:

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

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

e6f21ea

Parents:

ec36247

git-author:

Jason Gross <jgross@mit.edu> (05/26/13 12:50:13)

git-committer:

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

Message:

Add a -f flag to :flush-logs

This allows us to bypass any troublesome messages in the queue.

Files:

• commands.c (modified) (2 diffs)
• logging.c (modified) (4 diffs)

commands.c

@@ -488 +488 @@
               "SEE ALSO: aaway, zaway"),
 
-  OWLCMD_VOID("flush-logs", owl_command_flushlogs, OWL_CTX_ANY,
+  OWLCMD_ARGS("flush-logs", owl_command_flushlogs, OWL_CTX_ANY,
               "flush the queue of messages waiting to be logged",
-              "",
+              "flush-logs [-f | --force]",
               "If BarnOwl failed to log a file, this command tells\n"
               "BarnOwl to try logging the messages that have since\n"
-              "come in, and to resume logging normally."),
+              "come in, and to resume logging normally.\n"
+              "\n"
+              "Normally, if logging any of these messages fails,\n"
+              "that message is added to the queue of messages waiting\n"
+              "to be logged, and any new messages are deferred until\n"
+              "the next :flush-logs.  If the --force flag is passed,\n"
+              "any messages on the queue which cannot successfully be\n"
+              "logged are dropped, and BarnOwl will resume logging\n"
+              "normally."),
 
   OWLCMD_ARGS("load-subs", owl_command_loadsubs, OWL_CTX_ANY,
@@ -1444 +1452 @@
 }
 
-void owl_command_flushlogs(void)
-{
-  owl_log_flush_logs();
+char *owl_command_flushlogs(int argc, const char *const *argv, const char *buff)
+{
+  if (argc == 1) {
+    owl_log_flush_logs(false);
+  } else if (argc == 2) {
+    if (!strcmp(argv[1], "-f") || !strcmp(argv[1], "--force")) {
+      owl_log_flush_logs(true);
+    } else {
+      owl_function_makemsg("Invalid flag to flush-logs: %s", argv[1]);
+    }
+  } else {
+    owl_function_makemsg("Wrong number of arguments for flush-logs.");
+  }
+  return NULL;
 }
 

logging.c

@@ -211 +211 @@
 }
 #endif
+
+static void owl_log_file_error(owl_log_entry *msg, int ret)
+{
+  owl_log_error("Unable to open file for logging: %s (file %s)",
+                g_strerror(ret),
+                msg->filename);
+}
 
 /* If we are deferring log messages, enqueue this entry for writing.
@@ -236 +243 @@
       owl_log_deferred_enqueue_message(msg->message, msg->filename);
     } else if (ret != 0) {
-      owl_log_error("Unable to open file for logging: %s (file %s)",
-                    g_strerror(ret),
-                    msg->filename);
+      owl_log_file_error(msg, ret);
     }
   }
@@ -247 +252 @@
 {
   owl_log_entry *entry;
+  bool drop_failed_logs = *(bool *)data;
+  int ret;
 
   defer_logs = false;
   while (!g_queue_is_empty(deferred_entry_queue) && !defer_logs) {
     entry = (owl_log_entry*)g_queue_pop_head(deferred_entry_queue);
-    owl_log_eventually_write_entry(entry);
+    if (drop_failed_logs) {
+      owl_log_eventually_write_entry(entry);
+    } else {
+      ret = owl_log_try_write_entry(entry);
+      if (ret != 0) {
+        owl_log_file_error(entry, ret);
+      }
+    }
     owl_log_entry_free(entry);
   }
 }
 
-void owl_log_flush_logs(void)
-{
-  owl_select_post_task(owl_log_write_deferred_entries, NULL, NULL, log_context);
+void owl_log_flush_logs(bool drop_failed_logs)
+{
+  bool *data = g_new(bool, 1);
+  *data = drop_failed_logs;
+
+  owl_select_post_task(owl_log_write_deferred_entries,
+                       data,
+                       g_free,
+                       log_context);
 }
 
@@ -539 +559 @@
 {
   /* flush the deferred logs queue, trying to write the
-   * entries to the disk one last time */
-  owl_log_write_deferred_entries(NULL);
+   * entries to the disk one last time.  Drop any failed
+   * entries */
+  bool bool_true = true;
+  owl_log_write_deferred_entries(&bool_true);
 #if GLIB_CHECK_VERSION(2, 32, 0)
   g_queue_free_full(deferred_entry_queue, owl_log_entry_free);