Revert to KILL test servers until all test servers
have proper TERM and INT signal handlers implemented.
This commit is contained in:
parent
7f2d5cab2d
commit
adea16a294
10
tests/ftp.pm
10
tests/ftp.pm
@ -262,9 +262,9 @@ sub stopprocess {
|
|||||||
if(not defined $pids) {
|
if(not defined $pids) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
signalpids("TERM", $pids);
|
signalpids("KILL", $pids);
|
||||||
if(waitdeadpid($pids, $ONE_HALF_STOP_TIMEOUT) == 0) {
|
if(waitdeadpid($pids, $ONE_HALF_STOP_TIMEOUT) == 0) {
|
||||||
signalpids("INT", $pids);
|
signalpids("KILL", $pids);
|
||||||
if(waitdeadpid($pids, $ONE_THIRD_STOP_TIMEOUT) == 0) {
|
if(waitdeadpid($pids, $ONE_THIRD_STOP_TIMEOUT) == 0) {
|
||||||
signalpids("KILL", $pids);
|
signalpids("KILL", $pids);
|
||||||
if(waitdeadpid($pids, $ONE_SIXTH_STOP_TIMEOUT) == 0) {
|
if(waitdeadpid($pids, $ONE_SIXTH_STOP_TIMEOUT) == 0) {
|
||||||
@ -308,6 +308,12 @@ sub stopprocesspidfile {
|
|||||||
sub ftpkillslave {
|
sub ftpkillslave {
|
||||||
my ($id, $ext)=@_;
|
my ($id, $ext)=@_;
|
||||||
|
|
||||||
|
if(not defined $id) {
|
||||||
|
$id = "";
|
||||||
|
}
|
||||||
|
if(not defined $ext) {
|
||||||
|
$ext = "";
|
||||||
|
}
|
||||||
my $ret = 1; # assume success stopping them
|
my $ret = 1; # assume success stopping them
|
||||||
my $pids = "";
|
my $pids = "";
|
||||||
my $pidfiles = "";
|
my $pidfiles = "";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user