Changeset 580 for trunk/lib/Perlbal/Plugin/AtomStream.pm

Timestamp:

09/29/06 09:29:04 (3 years ago)

Author:

aimbert

Message:

add a path filter t the AtomStream:

- the AtomInject plugin receives a PUT request on a given path ("$put_path") with the content of an entry.
- the AtomStream plugin receives a GET request on another path ("$get_path/atom-stream.xml") (the arg 'since' is still allowed)

$put_path and $get_path can be '/' or '/a' or '/a/b', ....

then the AtomStream plugin produces a result filtered like this:

GET /atom-stream.xml returns everything ('/' or '/a' or '/a/b')
GET /a/atom-stream.xml returns the entries put with '/a' or '/a/b'
GET /a/b/atom-stream.xml returns the entries put with '/a/b'

Files:

• trunk/lib/Perlbal/Plugin/AtomStream.pm (modified) (7 diffs)

trunk/lib/Perlbal/Plugin/AtomStream.pm

@@ -1 +1 @@
 package Perlbal::Plugin::AtomStream;
+
+use URI;
 
 use Perlbal;
@@ -6 +8 @@
 
 our @subs;    # subscribers
-our @recent;  # recent items in format [$epoch, $atom_ref]
+our @recent;  # recent items in format [$epoch, $atom_ref, $path_segments_arrayref]
 
 our $last_timestamp = 0;
@@ -14 +16 @@
 sub InjectFeed {
     my $class = shift;
-    my $atomref = shift;
+    my ($atomref, $path) = @_;
 
     # maintain queue of last 60 seconds worth of posts
     my $now = time();
-    push @recent, [ $now, $atomref ];
+    my @put_segments = URI->new($path)->path_segments;
+    push @recent, [ $now, $atomref, \@put_segments ];
     shift @recent while @recent && $recent[0][0] <= $now - 60;
 
@@ -30 +33 @@
         }
 
+        next unless filter(\@put_segments, $s->{scratch}{get_segments});
+        
         my $lag = $s->{write_buf_size};
 
@@ -58 +63 @@
 }
 
+sub filter {
+    my ($put, $get) = @_;
+    return 0 if scalar @$put < scalar @$get;
+    for( my $i = 0 ; $i < scalar @$get ; $i++) {
+        return 0 if $put->[$i] ne $get->[$i];
+    }
+    return 1;
+}
+
 # called when we're being added to a service
 sub register {
@@ -72 +86 @@
         my Perlbal::HTTPHeaders $hds = $self->{req_headers};
         return 0 unless $hds;
-        my $uri = $hds->request_uri;
-        return 0 unless $uri =~ m!^/atom-stream\.xml(?:\?since=(\d+))?$!;
-        my $since = $1 || 0;
+        my $uri = URI->new($hds->request_uri);
+        my @get_segments = $uri->path_segments;
+        $self->{scratch}{get_segments} = \@get_segments;
+        return 0 unless pop @get_segments eq 'atom-stream.xml';
+        my %params = $uri->query_form;
+        my $since = $params{since} =~ /\d+/ ? $params{since} : 0;
 
         my $res = $self->{res_headers} = Perlbal::HTTPHeaders->new_response(200);
@@ -90 +107 @@
             foreach my $item (@recent) {
                 next if $item->[0] < $since;
+                next unless filter($item->[2], \@get_segments);
                 $last_rv = $self->write($item->[1]);
             }