fix bug in Mojo::IOLoop where the callback passed to next_tick would …

…receive the wrong invocant
mojolicious · Jan 26, 2015 · e180c04 · e180c04
1 parent aaf1d54
commit e180c04
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -6,6 +6,8 @@
   - Improved Hypnotoad to wait for new workers to be ready before stopping the
     old ones during hot deployment.
   - Improved commands and log messages to use less punctuation.
+  - Fixed bug in Mojo::IOLoop where the callback passed to next_tick would
+    receive the wrong invocant.
   - Fixed race condition and memory leak in Mojo::Server::Prefork.
 
 5.74  2015-01-25

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -86,8 +86,14 @@ sub delay {
 }
 
 sub is_running { _instance(shift)->reactor->is_running }
-sub next_tick  { _instance(shift)->reactor->next_tick(@_) }
-sub one_tick   { _instance(shift)->reactor->one_tick }
+
+sub next_tick {
+  my ($self, $cb) = (_instance(shift), @_);
+  weaken $self;
+  return $self->reactor->next_tick(sub { $self->$cb });
+}
+
+sub one_tick { _instance(shift)->reactor->one_tick }
 
 sub recurring { shift->_timer(recurring => @_) }
 

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -155,12 +155,12 @@ sub _spawn {
     if $pid;
 
   # Prepare lock file
-  my $file = $self->{lock_file};
+  my $file = $self->cleanup(0)->{lock_file};
   $self->app->log->error(qq{Can't open lock file "$file": $!})
     unless open my $handle, '>', $file;
 
   # Change user/group
-  $self->cleanup(0)->setuidgid;
+  $self->setuidgid;
 
   # Accept mutex
   weaken $self;
@@ -185,8 +185,8 @@ sub _spawn {
   $loop->unlock(sub { flock $handle, LOCK_UN });
 
   # Heartbeat messages
-  $loop->next_tick(sub { $self->_heartbeat(0) });
   my $cb = sub { $self->_heartbeat(shift->max_connections ? 0 : 1) };
+  $loop->next_tick($cb);
   $loop->recurring($self->heartbeat_interval => $cb);
 
   # Clean worker environment

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -27,9 +27,10 @@ is ref $loop->reactor, 'MyReactor', 'right class';
 my $err;
 Mojo::IOLoop->next_tick(
   sub {
-    eval { Mojo::IOLoop->start };
+    my $loop = shift;
+    eval { $loop->start };
     $err = $@;
-    Mojo::IOLoop->stop;
+    $loop->stop;
   }
 );
 Mojo::IOLoop->start;