Changeset e08487a for perl/lib

Timestamp:

Aug 5, 2017, 11:23:02 PM (7 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

9410677

Parents:

4bbe53a

git-author:

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

git-committer:

Jason Gross <jgross@mit.edu> (08/05/17 23:23:02)

Message:

Moved log generation code to perl.

Location:

perl/lib/BarnOwl

Files:

• Message.pm (modified) (1 diff)
• Message/Zephyr.pm (modified) (1 diff)

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;