Mercurial > hg > nginx-tests
changeset 1677:f13ead27f89c
Tests: improved stop() to send TERM after QUIT.
It is possible that graceful stop as initiated by SIGQUIT will take
very long time, such as when waiting for proxy_timeout in mail proxy
(defaults to 24h). To make sure in such cases nginx is stopped after
some reasonable time, we now send SIGTERM after waiting for 90 seconds.
Note that win32 version previously used "-s stop", which is equivalent
to SIGTERM rather than SIGQUIT. This seems accidental error during
introduction of initial win32 support in tests (ce2e23daa1da), so
it is changed to follow the same logic.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 19 May 2021 04:32:55 +0300 |
| parents | 816d6ceefe50 |
| children | d0025a0dead7 |
| files | lib/Test/Nginx.pm |
| diffstat | 1 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Test/Nginx.pm +++ b/lib/Test/Nginx.pm @@ -509,14 +509,39 @@ sub stop() { my @error = $self->has_version('1.19.5') ? ('-e', 'error.log') : (); system($NGINX, '-p', $testdir, '-c', "nginx.conf", - '-s', 'stop', @error, @globals) == 0 + '-s', 'quit', @error, @globals) == 0 or die "system() failed: $?\n"; } else { kill 'QUIT', $pid; } - waitpid($pid, 0); + my $exited; + + for (1 .. 900) { + $exited = waitpid($pid, WNOHANG) != 0; + last if $exited; + select undef, undef, undef, 0.1; + } + + if (!$exited) { + if ($^O eq 'MSWin32') { + my $testdir = $self->{_testdir}; + my @globals = $self->{_test_globals} ? + () : ('-g', "pid $testdir/nginx.pid; " + . "error_log $testdir/error.log debug;"); + my @error = $self->has_version('1.19.5') ? + ('-e', 'error.log') : (); + system($NGINX, '-p', $testdir, '-c', "nginx.conf", + '-s', 'stop', @error, @globals) == 0 + or die "system() failed: $?\n"; + + } else { + kill 'TERM', $pid; + } + + waitpid($pid, 0); + } $self->{_started} = 0;