added heartbeat event to Mojo::Server::Prefork

mojolicious · Jan 16, 2013 · c3c0c46 · c3c0c46
1 parent 33f97a5
commit c3c0c46
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -83,7 +83,7 @@ sub _heartbeat {
   return unless $self->{reader}->sysread(my $chunk, 4194304);
 
   # Update heartbeats
-  $self->{pool}{$1} and $self->{pool}{$1}{time} = time
+  $self->{pool}{$1} and $self->emit(heartbeat => $1)->{pool}{$1}{time} = time
     while $chunk =~ /(\d+)\n/g;
 }
 
@@ -320,10 +320,19 @@ can emit the following new ones.
 
 Emitted when the server shuts down.
 
+=head2 heartbeat
+
+  $prefork->on(heartbeat => sub {
+    my ($prefork, $pid) = @_;
+    ...
+  });
+
+Emitted when a heartbeat message has been received from a worker.
+
 =head2 manage
 
   $prefork->on(manage => sub {
-    my $prefork = shift;
+    my ($prefork, $pid) = @_;
     ...
   });
 

diff --git a/t/mojo/prefork.t b/t/mojo/prefork.t
@@ -11,27 +11,31 @@ use Test::More;
 plan skip_all => 'set TEST_PREFORK to enable this test (developer only!)'
   unless $ENV{TEST_PREFORK};
 
+use List::Util 'first';
 use Mojo::IOLoop;
 use Mojo::Server::Prefork;
 use Mojo::UserAgent;
-use Mojolicious::Lite;
-
-# Silence
-app->log->level('fatal');
-
-get '/' => {text => 'just works!'};
 
 # Basic functionality
 my $port = Mojo::IOLoop->generate_port;
-my $prefork
-  = Mojo::Server::Prefork->new(app => app, listen => ["http://*:$port"]);
+my $prefork = Mojo::Server::Prefork->new(listen => ["http://*:$port"]);
+$prefork->unsubscribe('request');
+$prefork->on(
+  request => sub {
+    my ($prefork, $tx) = @_;
+    $tx->res->code(200);
+    $tx->res->body('just works!');
+    $tx->resume;
+  }
+);
 is $prefork->workers, 4, 'start with four workers';
-my (@spawn, @reap, $tx, $graceful);
+my (@spawn, @reap, $worker, $tx, $graceful);
 $prefork->on(spawn => sub { push @spawn, pop });
-$prefork->on(
-  manage => sub {
-    my $prefork = shift;
-    $tx = Mojo::UserAgent->new->get("http://localhost:$port");
+$prefork->once(
+  heartbeat => sub {
+    my ($prefork, $pid) = @_;
+    $worker = $pid;
+    $tx     = Mojo::UserAgent->new->get("http://localhost:$port");
     kill 'QUIT', $$;
   }
 );
@@ -40,6 +44,7 @@ $prefork->on(finish => sub { $graceful = pop });
 $prefork->run;
 is scalar @spawn, 4, 'four workers spawned';
 is scalar @reap,  4, 'four workers reaped';
+ok !!first { $worker eq $_ } @spawn, 'worker has a heartbeat';
 ok $graceful, 'server has been stopped gracefully';
 is_deeply [sort @spawn], [sort @reap], 'same process ids';
 is $tx->res->code, 200,           'right status';