better attribute name

mojolicious · Jan 15, 2015 · a87e2ff · a87e2ff
1 parent 7536b49
commit a87e2ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -92,7 +92,7 @@ sub _connect {
     ->watch($handle, 0, 1);
 }
 
-sub _port { $_[0]->{socks_port} || $_[0]->{port} || ($_[0]->{tls} ? 443 : 80) }
+sub _port { $_[0]{socks_port} || $_[0]{port} || ($_[0]{tls} ? 443 : 80) }
 
 sub _ready {
   my ($self, $args) = @_;

diff --git a/lib/Mojo/Server/Morbo.pm b/lib/Mojo/Server/Morbo.pm
@@ -35,15 +35,15 @@ sub run {
   local $SIG{CHLD} = sub { $self->_reap };
   local $SIG{INT} = local $SIG{TERM} = local $SIG{QUIT} = sub {
     $self->{finished} = 1;
-    kill 'TERM', $self->{running} if $self->{running};
+    kill 'TERM', $self->{worker} if $self->{worker};
   };
   unshift @{$self->watch}, $app;
   $self->{modified} = 1;
 
   # Prepare and cache listen sockets for smooth restarting
   my $daemon = Mojo::Server::Daemon->new(silent => 1)->start->stop;
 
-  $self->_manage while !$self->{finished} || $self->{running};
+  $self->_manage while !$self->{finished} || $self->{worker};
   exit 0;
 }
 
@@ -64,27 +64,27 @@ sub _manage {
 
   if (defined(my $file = $self->check)) {
     say qq{File "$file" changed, restarting.} if $ENV{MORBO_VERBOSE};
-    kill 'TERM', $self->{running} if $self->{running};
+    kill 'TERM', $self->{worker} if $self->{worker};
     $self->{modified} = 1;
   }
 
   $self->_reap;
-  $self->_spawn if !$self->{running} && delete $self->{modified};
+  $self->_spawn if !$self->{worker} && delete $self->{modified};
   sleep 1;
 }
 
-sub _reap { delete $_[0]{running} while (waitpid -1, WNOHANG) > 0 }
+sub _reap { delete $_[0]{worker} while (waitpid -1, WNOHANG) > 0 }
 
 sub _spawn {
   my $self = shift;
 
   # Fork
   my $manager = $$;
   $ENV{MORBO_REV}++;
-  die "Can't fork: $!" unless defined(my $pid = fork);
+  die "Can't fork: $!" unless defined(my $pid = $self->{worker} = fork);
 
   # Manager
-  return $self->{running} = $pid if $pid;
+  return if $pid;
 
   # Worker
   $SIG{CHLD} = 'DEFAULT';