Changeset 357

Timestamp:

11/11/06 15:12:07 (5 years ago)

Author:

nick

Message:

Get working

Location:

wiki-toolkit-plugin-ping

Files:

• lib/Wiki/Toolkit/Plugin/Ping.pm (modified) (4 diffs)
• t/01_init.t (modified) (3 diffs)
• t/02_call.t (modified) (3 diffs)

wiki-toolkit-plugin-ping/lib/Wiki/Toolkit/Plugin/Ping.pm

@@ -8 +8 @@
 use Wiki::Toolkit::Plugin;
 use LWP;
+use LWP::UserAgent;
 
 @ISA = qw( Wiki::Toolkit::Plugin );
@@ -16 +17 @@
 sub new {
     my $class = shift;
-    my %services = @_;
+    my %args = @_;
 
     my $self = {};
     bless $self, $class;
+
+    # Get list of services
+    unless($args{services}) { 
+        $self->{services} = {};
+        return $self; 
+    }
+    my %services = %{$args{services}};
+
+    # Get node -> URL mapping
+    unless($args{node_to_url}) {
+        die("Must supply 'node_to_url;");
+    }
+    unless($args{node_to_url} =~ /\$node/) {
+        die("node_to_url '$args{node_to_url}' must contain \$node");
+    }
+    $self->{node_to_url} = $args{node_to_url};
+    
 
     # Check the services
@@ -42 +60 @@
 }
 
+# Return our list of services, in case anyone's interested
+sub services {
+    my $self = shift;
+    return %{$self->{services}};
+}
+
 # Define our post_write plugin, which does the ping
 # Happens in another thread, to stop it slowing things down
 sub post_write {
     my $self = shift;
+    unless(keys %{$self->{services}}) { return; }
 
     my %args = @_;
@@ -52 +77 @@
 
     # Spawn a new thread
+    my $pid = fork();
+    if($pid) {
+        # We're the main thread, return now
+        return;
+    } else {
+        # We're the child, do the work
 
-    # Build the ping URL
-    # Ping
+        # What's the URL of the node?
+        my $node_url = $self->{node_to_url};
+        $node_url =~ s/\$node/$node/;
+
+        # Get a LWP instance
+        my $ua = LWP::UserAgent->new;
+        $ua->agent("Wiki::Toolkit::Plugin::Ping $version");        
+
+        # Ping each service
+        foreach my $service (keys %{$self->{services}}) {
+            # Build the ping URL
+            my $ping_url = $self->{services}->{$service};
+            $ping_url =~ s/\$url/$node_url/;
+
+            # Ping
+            my $req = HTTP::Request->new(GET => $ping_url);
+            my $res = $ua->request($req);
+            unless($res->is_success) {
+                warn("Error pinging $service: $res->status_line");
+            }
+        }
+
+        # All done, close the thread
+        exit;
+    }
 }
 

wiki-toolkit-plugin-ping/t/01_init.t

@@ -4 +4 @@
 use Wiki::Toolkit::Plugin::Ping;
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 # Basic create
@@ -12 +12 @@
 # Several URls create
 my $plugin2 = Wiki::Toolkit::Plugin::Ping->new(
+    node_to_url => 'http://localhost/\$node',
+    services => {
         test => 'http://hello/?$url',
         test2 => 'http://hello/?$url',
+    }
 );
 ok( !undef $plugin2, "Plugin was created OK with no URLs" );
@@ -21 +24 @@
 eval {
     $plugin3 = Wiki::Toolkit::Plugin::Ping->new(
+        node_to_url => 'http://localhost/\$node',
+        services => {
             test => 'http://something/'
+        }
     );
 };
-warn("Plugin3 is '$plugin3'\n");
 ok( ! $plugin3, "Can't create with a url missing \$url" );
+
+# Don't give the URL builder
+my $plugin4 = undef;
+eval {
+    $plugin4 = Wiki::Toolkit::Plugin::Ping->new(
+        services => {
+            test => 'http://something/$url'
+        }
+    );
+};
+ok( ! $plugin4, "Can't create with a node_to_url missing" );
+

wiki-toolkit-plugin-ping/t/02_call.t

@@ -6 +6 @@
 use Wiki::Toolkit::Plugin::Ping;
 
-use Test::More tests => 1;
+use IO::Socket;
+
+use Test::More tests => 4;
 
 
@@ -20 +22 @@
 
 # Listen on a special port, so we can check a ping happened
+my $sock = new IO::Socket::INET (
+                    LocalPort => 112233,
+                    Proto => 'tcp',
+                    Listen => 1,
+);
+unless($sock) {
+    die("Can't listen on port 112233 for test");
+}
 
 
 # Create, to call localhost
 my $plugin = Wiki::Toolkit::Plugin::Ping->new(
+    node_to_url => "http://wiki.org/\$node",
+    services => {
         test => "http://localhost:112233/url=\$url"
+    }
 );
 ok( $plugin, "Plugin was created OK with the local URL" );
@@ -39 +52 @@
         metadata => {}
 );
+
+# Check they actually sent us something
+my $rsock = $sock->accept();
+my @req;
+my $going = 1;
+while($going && (my $line = <$rsock>)) {
+    $line =~ s/\r?\n$//;
+    unless($line) { $going = 0; }
+
+    push @req,$line;
+    warn "**$line**\n";
+}
+
+# Check they requested the right thing
+like( $req[0], qr/^GET \/url=http:\/\/wiki.org\/TestNode/, "Did right get" );
+like( $req[2], qr/^Host: localhost:112233/, "Correct http/1.1 host" );
+
+# Send them an OK
+print $rsock "HTTP/1.0 200 OK\r\n\r\n";
+
+# Close
+close($rsock);
+close($sock);
+
+# All happy
+ok( "Happy" );