From 1efd64d84f0d516de989470f92a2e38d6c9e1b19 Mon Sep 17 00:00:00 2001
From: Anthony Molinaro <anthonym@alumni.caltech.edu>
Date: Wed, 30 Jun 2010 20:14:56 +0000
Subject: [PATCH] minor fixups

git-svn-id: https://lwes.svn.sourceforge.net/svnroot/lwes/lwes-perl/trunk@510 a2f82657-cdd2-4550-bd36-68a8e7111808
---
 ChangeLog                  |  7 +++++++
 Makefile.PL                |  2 +-
 lwes-perl-event-listener   | 18 +++++++-----------
 lwes-perl-journal-listener | 19 +++++++++++++++++++
 4 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..d8b804e
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,7 @@
+Version 0.3.1 (molinaro)
+	* Header fields now consistent with 2 listener scripts
+	* Journal listener now has stats
+
+Version 0.3.0 (molinaro)
+	* Journal listener added
+	* Math::BigInt added for 64 bit values, no more hex
diff --git a/Makefile.PL b/Makefile.PL
index cbfa1e0..cf79186 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ my $lwes_cflags = `$pkg_cfg pkg-config lwes-0 --cflags`;
 
 WriteMakefile(
     'NAME'           => 'LWES',
-    'VERSION'        => '0.3.0',
+    'VERSION'        => '0.3.1',
     'EXE_FILES'      => [ "lwes-perl-event-listener",
                           "lwes-perl-journal-listener" ],
     'PREREQ_PM'      => {
diff --git a/lwes-perl-event-listener b/lwes-perl-event-listener
index 75c837f..e47b271 100644
--- a/lwes-perl-event-listener
+++ b/lwes-perl-event-listener
@@ -111,19 +111,15 @@ while (1)
 
     # set up a header similiar to the lwes header
     my ($seconds, $microseconds) = gettimeofday;
-    $event->{'SenderPort'} = $port;
-    $event->{'SenderIP'}   = inet_ntoa($peeraddr);
-    $event->{'ReceiptTime'}= $seconds*1000+int($microseconds/1000);
+    my $millis = int($microseconds/1000);
+
+    $event->{'ReceiptTime'}       = $seconds*1000+$millis;
+    $event->{'ReceiptTimeSecs'}   = $seconds;
+    $event->{'ReceiptTimeMillis'} = $millis;
+    $event->{'SenderIP'}          = inet_ntoa($peeraddr);
+    $event->{'SenderPort'}        = $port;
 
     # let the listener process the event
-#    if (defined ($listener_object))
-#      {
-#        $listener_object->processEvent($event);
-#      }
-#    else
-#      {
-#        processEvent ($event);
-#      }
     $processEventFunc->($event);
   }
 
diff --git a/lwes-perl-journal-listener b/lwes-perl-journal-listener
index 9e7e916..9827df9 100755
--- a/lwes-perl-journal-listener
+++ b/lwes-perl-journal-listener
@@ -7,15 +7,18 @@ use Getopt::Long;
 use Pod::Usage;
 use LWES::EventParser;
 use LWES::Listener;
+use POSIX qw(strftime);
 
 my $help_opt         = 0;
 my $man_opt          = 0;
 my $verbose_opt      = 0;
+my $stats_opt        = 0;
 
 GetOptions
   (
     'help'           => \$help_opt,
     'man'            => \$man_opt,
+    'stats'          => \$stats_opt,
     'verbose'        => \$verbose_opt,
   ) or pod2usage (2);
 
@@ -40,6 +43,15 @@ my $processEventFunc = getProcessEventFunc ($listener_or_code, @ARGV);
 
 foreach my $journal (@ARGV)
   {
+    my $start      = time();
+    my $log_date   = strftime ("%a %b %e %H:%M:%S %Y", localtime ($start));
+    my $num_events = 0;
+
+    if ($stats_opt)
+      {
+        print "$log_date : $journal ";
+      }
+
     if (-f $journal)
       {
         open FH, "zcat $journal |";
@@ -68,6 +80,7 @@ foreach my $journal (@ARGV)
 
                 # call handler
                 $processEventFunc->($event);
+                $num_events++;
               }
             else
               {
@@ -77,6 +90,12 @@ foreach my $journal (@ARGV)
 
         close FH;
       }
+
+    if ($stats_opt)
+      {
+        my $end = time()-$start;
+        print "had $num_events events processed in $end seconds\n";
+      }
   }
 
 0;
-- 
2.11.4.GIT