Changeset 36332 for lang/perl

Timestamp:

01/02/10 10:31:00 (3 years ago)

Author:

kazuho

Message:

bugfix: start_server did not shutdown upon receiving SIGINT while the worker is failing to start up, releng 0.06

Location:

lang/perl/Server-Starter/trunk

Files:

• Changes (modified) (1 diff)
• lib/Server/Starter.pm (modified) (3 diffs)

lang/perl/Server-Starter/trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension Server::Starter.
+
+0.06  Sat Jan 02 10:26:00 2010
+        - bugfix: start_server did not shutdown upon receiving SIGINT while the worker is failing to start up
 
 0.05  Tue Oct 13 20:30:00 2009

lang/perl/Server-Starter/trunk/lib/Server/Starter.pm

@@ -12 +12 @@
 use Exporter qw(import);
 
-our $VERSION = '0.05';
+our $VERSION = '0.06';
 our @EXPORT_OK = qw(start_server server_ports);
+
+my @signals_received;
 
 sub start_server {
@@ -65 +67 @@
     
     # setup signal handlers
-    my @signals_received;
     $SIG{$_} = sub {
         push @signals_received, $_[0];
@@ -149 +150 @@
         print STDERR "starting new worker $pid\n";
         sleep $opts->{interval};
-        if (waitpid($pid, WNOHANG) <= 0) {
+        if ((grep { $_ ne 'HUP' } @signals_received)
+                || waitpid($pid, WNOHANG) <= 0) {
             last;
         }