Changeset 71085f0 for commands.c

Timestamp:

Feb 12, 2014, 3:05:20 PM (8 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

09a3afc

Parents:

66dc2c6

git-author:

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

git-committer:

Jason Gross <jgross@mit.edu> (02/12/14 15:05:20)

Message:

Add a -f flag to :flush-logs

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

File:

• commands.c (modified) (2 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,
@@ -1442 +1450 @@
 }
 
-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;
 }