Changeset 15917

Timestamp:

07/17/08 13:29:13 (5 years ago)

Author:

daisuke

Message:

more stats logging

Location:

lang/perl/Mvalve/trunk

Files:

• lib/Mvalve/Reader.pm (modified) (4 diffs)
• lib/Mvalve/Writer.pm (modified) (1 diff)
• t/05_log.t (modified) (4 diffs)

lang/perl/Mvalve/trunk/lib/Mvalve/Reader.pm

@@ -54 +54 @@
     }
 
+    my $destination = $message->header( &Mvalve::Const::DESTINATION_HEADER );
+
     if (&Mvalve::Const::MVALVE_TRACE && $table eq 'q_timed') {
         Mvalve::trace( "we should have dispatched at " . 
@@ -62 +64 @@
     # service name. this /could/ be used by the queue consumer, but it
     # is *not* a
-    my $destination = $message->header( &Mvalve::Const::DESTINATION_HEADER );
 
     if ( $qs->is_emergency( $table ) ||  $qs->is_timed( $table ) ) {
@@ -73 +74 @@
         $self->try_push( key => $destination );
 
-        return $message;
+        # XXX - This is bad practive, but oh well
+        goto RETURN_MESSAGE;
     }
 
@@ -90 +92 @@
     }
 
+RETURN_MESSAGE:
     # if we got here, we can just return the data
     Mvalve::trace( "message", $message->id, "being returned") if &Mvalve::Const::MVALVE_TRACE;
+    $self->log(
+        action => "dequeue",
+        destination => $destination,
+    );
     return $message;
 }

lang/perl/Mvalve/trunk/lib/Mvalve/Writer.pm

@@ -26 +26 @@
 
     $self->log(
-        action      => "insert",
+        action      => "enqueue",
         destination => $data{destination},
     );

lang/perl/Mvalve/trunk/t/05_log.t

@@ -12 +12 @@
     } else {
         $messages = $ENV{MVALVE_MESSAGE_COUNT} || 32;
-        plan(tests => 5 + 3 * $messages);
+        plan(tests => 6 + 3 * $messages);
     }
 
@@ -37 +37 @@
     );
 
+    my $logger = Mvalve::Logger::Stats->new(
+        q4mlog => {
+            connect_info => $q_config{args}->{connect_info}
+        }
+    );
+
+    { # XXX Hack: remove everything from stats log first
+        $logger->logger->q4m->dbh->do("DELETE FROM q_statslog");
+    }
+
     my $writer = Mvalve::Writer->new(
         queue => \%q_config,
-        logger => Mvalve::Logger::Stats->new(
-            q4mlog => {
-                connect_info => $q_config{args}->{connect_info}
-            }
-        )
+        logger => $logger,
     );
     my $reader = Mvalve::Reader->new(
         timeout   => 1,
+        logger    => $logger,
         throttler => {
             module    => 'Data::Valve',
@@ -82 +89 @@
 
     { # check the statslog
-        my $queue = Queue::Q4M->new(
-            connect_info => $q_config{args}->{connect_info}
-        );
-        my $log_count = 0;
-        while ($queue->next('q_statslog')) {
-            $log_count++;
-            last if $log_count == $count;
-        }
+        # XXX - HACK: get the database handle from stats logger
+        my $dbh = $logger->logger->q4m->dbh;
+        my $sth = $dbh->prepare("SELECT COUNT(*) FROM q_statslog WHERE action = ?");
+        $sth->execute('enqueue');
+        my ($log_count) = $sth->fetchrow_array();
+
         is($log_count, $count, "log matches insert count");
+        $dbh->do("DELETE FROM q_statslog");
     }
 
@@ -122 +128 @@
         is (keys %messages, 0, "consumed all messages");
     }
+
+    { # check the statslog
+        # XXX - HACK: get the database handle from stats logger
+        my $dbh = $logger->logger->q4m->dbh;
+        my $sth = $dbh->prepare("SELECT COUNT(*) FROM q_statslog WHERE action = ?");
+        $sth->execute('dequeue');
+        my ($log_count) = $sth->fetchrow_array();
+
+        is($log_count, $count + 1, "log matches insert count");
+        $dbh->do("DELETE FROM q_statslog");
+    }
 }