Changeset 6e764aa for logging.c

Timestamp:

Jan 7, 2014, 6:02:20 PM (8 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

bf61c61

Parents:

f511c1e

git-author:

Jason Gross <jgross@mit.edu> (07/12/11 16:19:57)

git-committer:

Jason Gross <jgross@mit.edu> (01/07/14 18:02:20)

Message:

Moved the checking of whether or not to log messages to perl

File:

• logging.c (modified) (2 diffs)

logging.c

@@ -24 +24 @@
   }
 
-  /* should we be logging this message? */
-  if (!owl_log_shouldlog_message(m)) {
-    owl_function_debugmsg("owl_log_message: not logging message");
-    return;
-  }
-
-  owl_log_perl(m);
+  g_free(owl_perlconfig_call_with_message("BarnOwl::Logging::log", m));
 
   owl_function_debugmsg("owl_log_message: leaving");
-}
-
-/* Return 1 if we should log the given message, otherwise return 0 */
-int owl_log_shouldlog_message(const owl_message *m) {
-  const owl_filter *f;
-
-  /* If there's a logfilter and this message matches it, log */
-  f=owl_global_get_filter(&g, owl_global_get_logfilter(&g));
-  if (f && owl_filter_message_match(f, m)) return(1);
-
-  /* otherwise we do things based on the logging variables */
-
-  /* skip login/logout messages if appropriate */
-  if (!owl_global_is_loglogins(&g) && owl_message_is_loginout(m)) return(0);
-      
-  /* check direction */
-  if ((owl_global_get_loggingdirection(&g)==OWL_LOGGING_DIRECTION_IN) && owl_message_is_direction_out(m)) {
-    return(0);
-  }
-  if ((owl_global_get_loggingdirection(&g)==OWL_LOGGING_DIRECTION_OUT) && owl_message_is_direction_in(m)) {
-    return(0);
-  }
-
-  if (owl_message_is_type_zephyr(m)) {
-    if (owl_message_is_personal(m) && !owl_global_is_logging(&g)) return(0);
-    if (!owl_message_is_personal(m) && !owl_global_is_classlogging(&g)) return(0);
-  } else {
-    if (owl_message_is_private(m) || owl_message_is_loginout(m)) {
-      if (!owl_global_is_logging(&g)) return(0);
-    } else {
-      if (!owl_global_is_classlogging(&g)) return(0);
-    }
-  }
-  return(1);
 }
 
@@ -120 +80 @@
 }
 
-void owl_log_append(const owl_message *m, const char *filename) {
-  char *buffer = owl_perlconfig_message_call_method(m, "log", 0, NULL);
-  owl_log_enqueue_message(buffer, filename);
-  g_free(buffer);
-}
-
 void owl_log_outgoing_zephyr_error(const owl_zwrite *zw, const char *text)
 {
-  owl_message *m;
-  /* create a present message so we can pass it to
-   * owl_log_shouldlog_message(void)
-   */
-  m = g_slice_new(owl_message);
+  owl_message *m = g_slice_new(owl_message);
   /* recip_index = 0 because there can only be one recipient anyway */
   owl_message_create_from_zwrite(m, zw, text, 0);
-  if (!owl_log_shouldlog_message(m)) {
-    owl_message_delete(m);
-    return;
-  }
-  char *buffer = owl_perlconfig_message_call_method(m, "log_outgoing_error", 0, NULL);
-  char *filenames_string = owl_perlconfig_call_with_message("BarnOwl::Logging::get_filenames_as_string", m);
-  char **filenames = g_strsplit(filenames_string, " ", 0);
-  char **filename_ptr;
-
-  for (filename_ptr = filenames; *filename_ptr != NULL; filename_ptr++) {
-    owl_log_enqueue_message(buffer, *filename_ptr);
-  }
-
-  g_free(filenames_string);
-  g_strfreev(filenames);
+  g_free(owl_perlconfig_call_with_message("BarnOwl::Logging::log_outgoing_error", m));
   owl_message_delete(m);
-}
-
-void owl_log_perl(const owl_message *m)
-{
-  char *filenames_string = owl_perlconfig_call_with_message("BarnOwl::Logging::get_filenames_as_string", m);
-  char **filenames = g_strsplit(filenames_string, "\n", 0);
-  char **filename_ptr;
-  g_free(filenames_string);
-
-  for (filename_ptr = filenames; *filename_ptr != NULL; filename_ptr++) {
-    owl_log_append(m, *filename_ptr);
-  }
-
-  g_strfreev(filenames);
 }