Changeset c877a63

Timestamp:

Jan 7, 2014, 6:00:45 PM (9 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

e7ab1d7

Parents:

db1a2f8b

git-author:

Jason Gross <jgross@mit.edu> (07/12/11 12:34:46)

git-committer:

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

Message:

Moved log generation code to perl.

Files:

• logging.c (modified) (2 diffs)
• perl/lib/BarnOwl/Message.pm (modified) (1 diff)
• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (1 diff)

logging.c

@@ -77 +77 @@
 }
 
-CALLER_OWN char *owl_log_zephyr(const owl_message *m)
-{
-    char *tmp = NULL;
-    GString *buffer = NULL;
-    buffer = g_string_new("");
-    tmp = short_zuser(owl_message_get_sender(m));
-    g_string_append_printf(buffer, "Class: %s Instance: %s", 
-                           owl_message_get_class(m), 
-                           owl_message_get_instance(m));
-    if (strcmp(owl_message_get_opcode(m), "")) {
-      g_string_append_printf(buffer, " Opcode: %s", 
-                             owl_message_get_opcode(m));
-    }
-    g_string_append_printf(buffer, "\n");
-    g_string_append_printf(buffer, "Time: %s Host: %s\n", 
-                           owl_message_get_timestr(m), 
-                           owl_message_get_hostname(m));
-    g_string_append_printf(buffer, "From: %s <%s>\n\n", 
-                           owl_message_get_zsig(m), tmp);
-    g_string_append_printf(buffer, "%s\n\n", owl_message_get_body(m));
-    g_free(tmp);
-    return g_string_free(buffer, FALSE);
-}
-
-CALLER_OWN char *owl_log_aim(const owl_message *m)
-{
-    GString *buffer = NULL;
-    buffer = g_string_new("");
-    g_string_append_printf(buffer, "From: <%s> To: <%s>\n", 
-                           owl_message_get_sender(m), owl_message_get_recipient(m));
-    g_string_append_printf(buffer, "Time: %s\n\n", 
-                           owl_message_get_timestr(m));
-    if (owl_message_is_login(m)) {
-        g_string_append_printf(buffer, "LOGIN\n\n");
-    } else if (owl_message_is_logout(m)) {
-        g_string_append_printf(buffer, "LOGOUT\n\n");
-    } else {
-        g_string_append_printf(buffer, "%s\n\n", owl_message_get_body(m));
-    }
-    return g_string_free(buffer, FALSE);
-}
-
-CALLER_OWN char *owl_log_jabber(const owl_message *m)
-{
-    GString *buffer = NULL;
-    buffer = g_string_new("");
-    g_string_append_printf(buffer, "From: <%s> To: <%s>\n",
-                           owl_message_get_sender(m), 
-                           owl_message_get_recipient(m));
-    g_string_append_printf(buffer, "Time: %s\n\n", 
-                           owl_message_get_timestr(m));
-    g_string_append_printf(buffer, "%s\n\n", owl_message_get_body(m));
-    return g_string_free(buffer, FALSE);
-}
-
-CALLER_OWN char *owl_log_generic(const owl_message *m)
-{
-    GString *buffer;
-    buffer = g_string_new("");
-    g_string_append_printf(buffer, "From: <%s> To: <%s>\n", 
-                           owl_message_get_sender(m), 
-                           owl_message_get_recipient(m));
-    g_string_append_printf(buffer, "Time: %s\n\n", 
-                           owl_message_get_timestr(m));
-    g_string_append_printf(buffer, "%s\n\n", 
-                           owl_message_get_body(m));
-    return g_string_free(buffer, FALSE);
-}
-
 static void owl_log_error_main_thread(gpointer data)
 {
@@ -198 +129 @@
 
 void owl_log_append(const owl_message *m, const char *filename) {
-  char *buffer = NULL;
-  if (owl_message_is_type_zephyr(m)) {
-    buffer = owl_log_zephyr(m);
-  } else if (owl_message_is_type_jabber(m)) {
-    buffer = owl_log_jabber(m);
-  } else if (owl_message_is_type_aim(m)) {
-    buffer = owl_log_aim(m);
-  } else {
-    buffer = owl_log_generic(m);
-  }
+  char *buffer = owl_perlconfig_message_call_method(m, "log", 0, NULL);
   owl_log_enqueue_message(buffer, filename);
   g_free(buffer);

perl/lib/BarnOwl/Message.pm

@@ -115 +115 @@
     }
     return $s;
+}
+
+=head2 log MESSAGE
+
+Returns the text that should be written to a file to log C<MESSAGE>.
+
+=cut
+
+sub log {
+    my ($m) = @_;
+    return $m->log_header . "\n\n" . $m->log_body . "\n\n";
+}
+
+=head2 log_header MESSAGE
+
+Returns the header of the message, for logging purposes.
+If you override L<BarnOwl::Message::log>, this method is not called.
+
+=cut
+
+sub log_header {
+    my ($m) = @_;
+    my $sender = $m->sender;
+    my $recipient = $m->recipient;
+    my $timestr = $m->time;
+    return "From: <$sender> To: <$recipient>\n"
+         . "Time: $timestr";
+}
+
+=head2 log_body MESSAGE
+
+Returns the body of the message, for logging purposes.
+If you override L<BarnOwl::Message::log>, this method is not called.
+
+=cut
+
+sub log_body {
+    my ($m) = @_;
+    if ($m->is_loginout) {
+        return uc($m->login)
+            . $m->login_type
+            . ($m->login_extra ? ' at ' . $m->login_extra : '');
+    } else {
+        return $m->body;
+    }
 }
 

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -223 +223 @@
 }
 
+# Logging
+sub log_header {
+    my ($m) = @_;
+    my $class = $m->class;
+    my $instance = $m->instance;
+    my $opcode = $m->opcode;
+    my $timestr = $m->time;
+    my $host = $m->host;
+    my $sender = $m->pretty_sender;
+    my $zsig = $m->zsig;
+    my $rtn = "Class: $class Instance: $instance";
+    $rtn .= " Opcode: $opcode" unless !defined $opcode || $opcode eq '';
+    $rtn .= "\nTime: $timestr Host: $host"
+          . "\nFrom: $zsig <$sender>";
+    return $rtn;
+}
 
 1;