small optimizations

mojolicious · Mar 7, 2014 · 408973f · 408973f
1 parent cfc9198
commit 408973f
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -34,17 +34,17 @@ sub setuidgid {
 
   # Group
   if (my $group = $self->group) {
-    return $self->_log(qq{Group "$group" does not exist.})
+    return $self->_log(error => qq{Group "$group" does not exist.})
       unless defined(my $gid = getgrnam $group);
-    return $self->_log(qq{Can't switch to group "$group": $!})
+    return $self->_log(error => qq{Can't switch to group "$group": $!})
       unless POSIX::setgid($gid);
   }
 
   # User
   return $self unless my $user = $self->user;
-  return $self->_log(qq{User "$user" does not exist.})
+  return $self->_log(error => qq{User "$user" does not exist.})
     unless defined(my $uid = getpwnam $user);
-  return $self->_log(qq{Can't switch to user "$user": $!})
+  return $self->_log(error => qq{Can't switch to user "$user": $!})
     unless POSIX::setuid($uid);
 
   return $self;
@@ -185,26 +185,21 @@ sub _listen {
 
       $stream->on(close => sub { $self->_close($id) });
       $stream->on(
-        error => sub {
-          return unless $self;
-          $self->app->log->error(pop);
-          $self->_close($id);
-        }
-      );
+        error => sub { $self && $self->_log(error => pop)->_close($id) });
       $stream->on(read => sub { $self->_read($id => pop) });
       $stream->on(timeout =>
-          sub { $self->app->log->debug('Inactivity timeout.') if $c->{tx} });
+          sub { $self->_log(debug => 'Inactivity timeout.') if $c->{tx} });
     }
   );
 
   return if $self->silent;
-  $self->app->log->info(qq{Listening at "$url".});
+  $self->_log(info => qq{Listening at "$url".});
   $query->params([]);
   $url->host('127.0.0.1') if $url->host eq '*';
   say "Server available at $url.";
 }
 
-sub _log { $_[0]->app->log->error($_[1]) and return $_[0] }
+sub _log { $_[0]->app->log->log(@_[1, 2]) and return $_[0] }
 
 sub _read {
   my ($self, $id, $chunk) = @_;