small Hypnotoad tweaks

mojolicious · Mar 31, 2012 · 2bf42a1 · 2bf42a1
1 parent 61beade
commit 2bf42a1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 39 deletions.
diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -46,14 +46,11 @@ sub run {
   # Start accepting connections
   $self->start;
 
-  # User and group
-  $self->setuidgid;
-
   # Signals
   $SIG{INT} = $SIG{TERM} = sub { exit 0 };
 
-  # Start loop
-  $self->ioloop->start;
+  # Change user/group and start loop
+  $self->setuidgid->ioloop->start;
 }
 
 sub setuidgid {
@@ -477,7 +474,7 @@ Run server.
 
 =head2 C<setuidgid>
 
-  $daemon->setuidgid;
+  $daemon = $daemon->setuidgid;
 
 Set user and group for process.
 

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -1,7 +1,6 @@
 package Mojo::Server::Hypnotoad;
 use Mojo::Base -base;
 
-use Carp 'croak';
 use Cwd 'abs_path';
 use Fcntl ':flock';
 use File::Basename 'dirname';
@@ -59,8 +58,7 @@ sub run {
   $0 = $ENV{HYPNOTOAD_APP};
 
   # Clean start
-  croak "Can't exec: $!"
-    if !$ENV{HYPNOTOAD_REV}++ && !exec $ENV{HYPNOTOAD_EXE};
+  die "Can't exec: $!" if !$ENV{HYPNOTOAD_REV}++ && !exec $ENV{HYPNOTOAD_EXE};
 
   # Preload application and configure server
   my $daemon = $self->{daemon} = Mojo::Server::Daemon->new;
@@ -96,8 +94,7 @@ sub run {
   $daemon->start;
 
   # Pipe for worker communication
-  pipe($self->{reader}, $self->{writer})
-    or croak "Can't create pipe: $!";
+  pipe($self->{reader}, $self->{writer}) or die "Can't create pipe: $!";
   $self->{poll} = IO::Poll->new;
   $self->{poll}->mask($self->{reader}, POLLIN);
 
@@ -111,8 +108,7 @@ sub run {
   $SIG{USR2} = sub { $self->{upgrade} ||= time };
   $SIG{TTIN} = sub { $c->{workers}++ };
   $SIG{TTOU} = sub {
-    return unless $c->{workers};
-    $c->{workers}--;
+    return unless $c->{workers} && $c->{workers}--;
     $self->{workers}->{shuffle keys %{$self->{workers}}}->{graceful} ||= time;
   };
 
@@ -174,10 +170,8 @@ sub _heartbeat {
   return unless $self->{reader}->sysread(my $chunk, 4194304);
 
   # Update heartbeats
-  while ($chunk =~ /(\d+)\n/g) {
-    my $pid = $1;
-    $self->{workers}->{$pid}->{time} = time if $self->{workers}->{$pid};
-  }
+  $self->{workers}->{$1} and $self->{workers}->{$1}->{time} = time
+    while $chunk =~ /(\d+)\n/g;
 }
 
 sub _hot_deploy {
@@ -225,8 +219,8 @@ sub _manage {
     # Fresh start
     unless ($self->{new}) {
       $self->{log}->info('Starting zero downtime software upgrade.');
-      croak "Can't fork: $!" unless defined(my $pid = $self->{new} = fork);
-      exec($ENV{HYPNOTOAD_EXE}) or croak("Can't exec: $!") unless $pid;
+      die "Can't fork: $!" unless defined(my $pid = $self->{new} = fork);
+      exec($ENV{HYPNOTOAD_EXE}) or die("Can't exec: $!") unless $pid;
     }
 
     # Timeout
@@ -262,8 +256,7 @@ sub _manage {
 }
 
 sub _pid {
-  my $self = shift;
-  return unless my $file = IO::File->new($self->{config}->{pid_file}, '<');
+  return unless my $file = IO::File->new(shift->{config}->{pid_file}, '<');
   my $pid = <$file>;
   chomp $pid;
   return $pid;
@@ -280,7 +273,7 @@ sub _pid_file {
 
   # Create PID file
   $self->{log}->info(qq/Creating process id file "$file"./);
-  croak qq/Can't create process id file "$file": $!/
+  die qq/Can't create process id file "$file": $!/
     unless my $pid = IO::File->new($file, '>', 0644);
   print $pid $$;
 }
@@ -310,18 +303,17 @@ sub _spawn {
   my $self = shift;
 
   # Manager
-  croak "Can't fork: $!" unless defined(my $pid = fork);
+  die "Can't fork: $!" unless defined(my $pid = fork);
   return $self->{workers}->{$pid} = {time => time} if $pid;
 
-  # Worker
-  my $daemon = $self->{daemon};
-  my $loop   = $daemon->ioloop;
-  my $c      = $self->{config};
-
   # Prepare lock file
+  my $c    = $self->{config};
   my $file = $c->{lock_file};
   my $lock = IO::File->new("> $file")
-    or croak qq/Can't open lock file "$file": $!/;
+    or die qq/Can't open lock file "$file": $!/;
+
+  # Change user/group
+  my $loop = $self->{daemon}->setuidgid->ioloop;
 
   # Accept mutex
   $loop->lock(
@@ -336,10 +328,7 @@ sub _spawn {
           $l = flock $lock, LOCK_EX;
           ualarm $old;
         };
-        if ($@) {
-          die $@ unless $@ eq "alarm\n";
-          $l = 0;
-        }
+        if ($@) { $l = $@ eq "alarm\n" ? 0 : die($@) }
       }
 
       # Non blocking
@@ -365,7 +354,6 @@ sub _spawn {
   $SIG{QUIT} = sub { $loop->max_connections(0) };
   delete $self->{reader};
   delete $self->{poll};
-  $daemon->setuidgid;
 
   # Start
   $self->{log}->debug("Worker $$ started.");

diff --git a/lib/Mojo/Server/Morbo.pm b/lib/Mojo/Server/Morbo.pm
@@ -1,7 +1,6 @@
 package Mojo::Server::Morbo;
 use Mojo::Base -base;
 
-use Carp 'croak';
 use Mojo::Home;
 use Mojo::Server::Daemon;
 use POSIX 'WNOHANG';
@@ -24,9 +23,7 @@ sub check_file {
   my $cache = $self->{cache} ||= {};
   my $stats = $cache->{$file} ||= [$^T, $size];
   return if $mtime <= $stats->[0] && $size == $stats->[1];
-  $cache->{$file} = [$mtime, $size];
-
-  return 1;
+  return $cache->{$file} = [$mtime, $size];
 }
 
 sub run {
@@ -99,7 +96,7 @@ sub _spawn {
   # Fork
   my $manager = $$;
   $ENV{MORBO_REV}++;
-  croak "Can't fork: $!" unless defined(my $pid = fork);
+  die "Can't fork: $!" unless defined(my $pid = fork);
 
   # Manager
   return $self->{running} = $pid if $pid;