Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Morbo can reuse more code from Mojo::Server::Daemon
  • Loading branch information
kraih committed Mar 7, 2015
1 parent 9fa8e0a commit 5da1865
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions lib/Mojo/Server/Morbo.pm
Expand Up @@ -31,7 +31,7 @@ sub run {
my ($self, $app) = @_;

# Clean manager environment
local $SIG{INT} = local $SIG{TERM} = local $SIG{QUIT} = sub {
local $SIG{INT} = local $SIG{TERM} = sub {
$self->{finished} = 1;
kill 'TERM', $self->{worker} if $self->{worker};
};
Expand Down Expand Up @@ -83,13 +83,10 @@ sub _spawn {
return if $pid;

# Worker
$SIG{INT} = $SIG{TERM} = $SIG{QUIT} = sub { $self->{finished} = 1 };
my $daemon = $self->{daemon};
$daemon->load_app($self->watch->[0]);
my $loop = $daemon->start->ioloop;
$loop->recurring(
1 => sub { shift->stop if !kill(0, $manager) || $self->{finished} });
$loop->start;
$daemon->ioloop->recurring(1 => sub { shift->stop unless kill 0, $manager });
$daemon->run;
exit 0;
}

Expand Down Expand Up @@ -135,7 +132,7 @@ See L<Mojolicious::Guides::Cookbook/"DEPLOYMENT"> for more.
The L<Mojo::Server::Morbo> process can be controlled at runtime with the
following signals.
=head2 INT, QUIT, TERM
=head2 INT, TERM
Shut down server immediately.
Expand Down

0 comments on commit 5da1865

Please sign in to comment.