use a more consistent attribute name

mojolicious · Jan 27, 2015 · f877d2a · f877d2a
1 parent a1d8aea
commit f877d2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/lib/Mojo/Server/Morbo.pm b/lib/Mojo/Server/Morbo.pm
@@ -33,7 +33,7 @@ sub run {
   # Clean manager environment
   local $SIG{CHLD} = sub { $self->_reap if $self->{worker} };
   local $SIG{INT} = local $SIG{TERM} = local $SIG{QUIT} = sub {
-    $self->{stop} = 1;
+    $self->{finished} = 1;
     kill 'TERM', $self->{worker} if $self->{worker};
   };
   unshift @{$self->watch}, $app;
@@ -42,7 +42,7 @@ sub run {
   # Prepare and cache listen sockets for smooth restarting
   my $daemon = Mojo::Server::Daemon->new(silent => 1)->start->stop;
 
-  $self->_manage while !$self->{stop} || $self->{worker};
+  $self->_manage while !$self->{finished} || $self->{worker};
   exit 0;
 }
 
@@ -88,14 +88,14 @@ sub _spawn {
 
   # Worker
   $SIG{CHLD} = 'DEFAULT';
-  $SIG{INT} = $SIG{TERM} = $SIG{QUIT} = sub { $self->{stop} = 1 };
+  $SIG{INT} = $SIG{TERM} = $SIG{QUIT} = sub { $self->{finished} = 1 };
   my $daemon = Mojo::Server::Daemon->new;
   $daemon->load_app($self->watch->[0]);
   $daemon->silent(1) if $ENV{MORBO_REV} > 1;
   $daemon->start;
   my $loop = $daemon->ioloop;
   $loop->recurring(
-    1 => sub { shift->stop if !kill(0, $manager) || $self->{stop} });
+    1 => sub { shift->stop if !kill(0, $manager) || $self->{finished} });
   $loop->start;
   exit 0;
 }

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -81,7 +81,9 @@ sub run {
   # Clean manager environment
   local $SIG{INT} = local $SIG{TERM} = sub { $self->_term };
   local $SIG{CHLD} = sub {
-    while ((my $pid = waitpid -1, WNOHANG) > 0) { $self->_reap($pid) }
+    while ((my $pid = waitpid -1, WNOHANG) > 0) {
+      $self->emit(reap => $pid)->_stopped($pid);
+    }
   };
   local $SIG{QUIT} = sub { $self->_term(1) };
   local $SIG{TTIN} = sub { $self->workers($self->workers + 1) };
@@ -103,7 +105,7 @@ sub _manage {
   my $self = shift;
 
   # Spawn more workers if necessary and check PID file
-  if (!$self->{stop}) {
+  if (!$self->{finished}) {
     $self->_spawn while keys %{$self->{pool}} < $self->workers;
     $self->ensure_pid_file;
   }
@@ -138,12 +140,10 @@ sub _manage {
     # Normal stop
     $log->debug("Stopping worker $pid")
       and (kill 'KILL', $pid or $self->_stopped($pid))
-      if $w->{force} || ($self->{stop} && !$graceful);
+      if $w->{force} || ($self->{finished} && !$graceful);
   }
 }
 
-sub _reap { shift->emit(reap => $_[0])->_stopped($_[0]) }
-
 sub _spawn {
   my $self = shift;
 
@@ -208,7 +208,10 @@ sub _stopped {
     unless $w->{healthy};
 }
 
-sub _term { @{$_[0]->emit(finish => $_[1])}{qw(stop graceful)} = (1, $_[1]) }
+sub _term {
+  my ($self, $graceful) = @_;
+  @{$self->emit(finish => $graceful)}{qw(finished graceful)} = (1, $graceful);
+}
 
 sub _wait {
   my $self = shift;