Changeset 15557

Timestamp:

07/09/08 13:34:05 (5 years ago)

Author:

daisuke

Message:

- do away with q_retry
- ...and therefore do away with a bunch of methods
- remove interval option from mvalve
- fix tests

Location:

lang/perl/Mvalve/trunk

Files:

• lib/Mvalve.pm (modified) (4 diffs)
• t/03_extended.t (modified) (4 diffs)

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

@@ -78 +78 @@
 );
 
-has 'interval' => (
-    is => 'rw',
-    isa => 'Int',
-    required => 1,
-    default => 10
-);
-
 has 'timeout' => (
     is => 'rw',
@@ -157 +150 @@
     }
 
-
     # otherwise, we need to check if this message is going to be throttled
-    trace( "checking if message to $destination should be throttled" ) if MVALVE_TRACE;
-    my $is_throttled =
-        $self->is_pending( $destination ) ||
-        ! $self->try_push( key => $destination )
-    ;
-
-    if ($is_throttled) {
+    my $is_pending   = $self->is_pending( $destination );
+    my $is_throttled = ! $self->try_push( key => $destination );
+    trace( "checking if message to $destination should be throttled (pending: $is_pending, throttled: $is_throttled)" ) if MVALVE_TRACE;
+
+    if ($is_throttled || $is_pending) {
         trace( "message", $message->id, "is being throttled") if MVALVE_TRACE;
         $self->defer( $message );
@@ -185 +175 @@
 
     my $qs          = $self->queue_set;
-    my $interval    = $self->interval;
+    my $interval    = $self->throttler->{db}->{chain}->{interval};
     my $table       = $qs->choose_table('timed');
     my $destination = $message->header( DESTINATION_HEADER );
@@ -248 +238 @@
 
 sub is_pending {
-    my( $self, $channel_id ) = @_;
-
-    my $retry_key = [ $channel_id, 'retry' ];
+    my( $self, $destination ) = @_;
+
+    my $retry_key = [ $destination, 'retry' ];
     my $count = $self->state_get($retry_key);
     return $count ? 1 : 0;

lang/perl/Mvalve/trunk/t/03_extended.t

@@ -16 +16 @@
 
     $ENV{MEMCACHED_SERVERS} ||= '127.0.0.1:11211';
-    $ENV{MEMCAHCED_NAMESPACE} ||= join('_', __FILE__, $$, {}, rand());
+    $ENV{MEMCACHED_NAMESPACE} ||= join('_', __FILE__, $$, {}, rand());
     $ENV{MEMCACHED_SERVERS} = [
         split(/\s*,\s*/, $ENV{MEMCACHED_SERVERS}) ];
@@ -41 +41 @@
             module    => 'Data::Throttler::Memcached',
             max_items => 1,
-            interval  => 10,
+            interval  => 2,
             cache     => {
                 data => $ENV{MEMCACHED_SERVERS},
@@ -75 +75 @@
         my $message = $mvalve->next;
         ok( $message, 'first message should not be throttled' );
-        delete $messages{ $message->id };
+        if ($message) {
+            delete $messages{ $message->id };
+        }
 
         $count--;
@@ -89 +91 @@
         my $i = 0;
         while ($i < $count) {
-            my $rv = $mvalve->next_retry;
             my $message = $mvalve->next;
-
-            next unless $rv;
+            next unless $message;
 
             ok( delete $messages{ $message->id }, "Deleting a proper (unhandled) message");