Changeset 35267

Timestamp:

09/09/09 14:49:07 (4 years ago)

Author:

kazuho

Message:

add startup fail test, refine messages

Location:

lang/perl/Server-Starter/trunk

Files:

• lib/Server/Starter.pm (modified) (6 diffs)
• t/03-startfail-server.pl (added)
• t/03-startfail.t (added)

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

@@ -56 +56 @@
     }
     $ENV{SERVER_STARTER_PORT} = join ";", @sockenv;
+    $ENV{SERVER_STARTER_GENERATION} = 0;
     
     # setup signal handlers
@@ -72 +73 @@
             my ($died_worker, $status) = @r;
             if ($died_worker == $current_worker) {
-                print STDERR "worker process $died_worker died unexpectedly with status:$status, restarting\n";
+                print STDERR "worker $died_worker died unexpectedly with status:$status, restarting\n";
                 $current_worker = _start_worker($opts);
             } else {
-                print STDERR "old worker process $died_worker died,"
-                    . " status:$status\n";
+                print STDERR "old worker $died_worker died, status:$status\n";
                 delete $old_workers{$died_worker};
             }
@@ -85 +85 @@
                 $old_workers{$current_worker} = 1;
                 $current_worker = _start_worker($opts);
-                print STDERR "sending TERM to old workers:";
+                print STDERR "new worker is now running, sending TERM to old workers:";
                 if (%old_workers) {
                     print STDERR join(',', sort keys %old_workers), "\n";
@@ -110 +110 @@
         if (my @r = wait3(1)) {
             my ($died_worker, $status) = @r;
-            print STDERR "worker process $died_worker died, status:$status\n";
+            print STDERR "worker $died_worker died, status:$status\n";
             delete $old_workers{$died_worker};
         }
@@ -131 +131 @@
     my $pid;
     while (1) {
+        $ENV{SERVER_STARTER_GENERATION}++;
         $pid = fork;
         die "fork(2) failed:$!"
@@ -140 +141 @@
             exit(255);
         }
-        print STDERR "starting new worker process, pid:$pid\n";
+        print STDERR "starting new worker $pid\n";
         sleep $opts->{interval};
         if (waitpid($pid, WNOHANG) <= 0) {
             last;
         }
-        print STDERR "new worker process seems to have failed to start, exit status:$?\n";
+        print STDERR "new worker $pid seems to have failed to start, exit status:$?\n";
     }
     $pid;