better description for finish event

mojolicious · Feb 17, 2015 · 035611a · 035611a
1 parent b563152
commit 035611a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -323,7 +323,8 @@ the following new ones.
     ...
   });
 
-Emitted when the event loop shuts down gracefully.
+Emitted when the event loop wants to shut down gracefully and is just waiting
+for all existing connections to be closed.
 
 =head1 ATTRIBUTES
 

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -153,10 +153,10 @@ sub _spawn {
   $self->cleanup(0)->setuidgid;
 
   # Heartbeat messages
-  weaken $self;
   my $loop     = $self->ioloop;
   my $finished = 0;
   $loop->on(finish => sub { $finished = 1 });
+  weaken $self;
   my $cb = sub { $self->_heartbeat($finished) };
   $loop->next_tick($cb);
   $loop->recurring($self->heartbeat_interval => $cb);

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -60,7 +60,7 @@ websocket '/socket' => sub {
 websocket '/early_start' => sub {
   my $c = shift;
   $c->send('test1');
-  $c->on(message => sub { shift->send(shift . 'test2')->finish });
+  $c->on(message => sub { shift->send(shift() . 'test2')->finish });
 };
 
 websocket '/denied' => sub {

diff --git a/t/mojo/websocket_proxy.t b/t/mojo/websocket_proxy.t
@@ -25,7 +25,7 @@ get '/proxy' => sub {
 
 websocket '/test' => sub {
   my $c = shift;
-  $c->on(message => sub { shift->send(shift . 'test2') });
+  $c->on(message => sub { shift->send(shift() . 'test2') });
 };
 
 # HTTP server for testing

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -40,7 +40,7 @@ get '/proxy' => sub {
 
 websocket '/test' => sub {
   my $c = shift;
-  $c->on(message => sub { shift->send(shift . 'test2') });
+  $c->on(message => sub { shift->send(shift() . 'test2') });
 };
 
 # Web server with valid certificates