mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
no, the kill servers messages need to be verbose, they're too frequent
This commit is contained in:
parent
abee109cd1
commit
957c258c6d
@ -1,12 +1,13 @@
|
||||
# make sure no leftovers are still running
|
||||
sub ftpkillslaves {
|
||||
my ($versbose) = @_;
|
||||
for $ext (("", "ipv6")) {
|
||||
for $id (("", "2")) {
|
||||
for $base (('filt', 'data')) {
|
||||
my $f = ".sock$base$id$ext.pid";
|
||||
my $pid = checkserver($f);
|
||||
if($pid > 0) {
|
||||
printf ("* kill pid for %-5s => %-5d\n", "ftp-$base$id$ext", $pid);
|
||||
printf ("* kill pid for %-5s => %-5d\n", "ftp-$base$id$ext", $pid) if($verbose);
|
||||
kill (9, $pid); # die!
|
||||
}
|
||||
unlink($f);
|
||||
|
@ -545,7 +545,7 @@ sub runftpserver {
|
||||
my $ip=$HOSTIP;
|
||||
my $nameext;
|
||||
|
||||
ftpkillslaves();
|
||||
ftpkillslaves($verbose);
|
||||
|
||||
if($ipv6) {
|
||||
# if IPv6, use a different setup
|
||||
@ -1572,10 +1572,10 @@ sub singletest {
|
||||
# Stop all running test servers
|
||||
sub stopservers {
|
||||
for(keys %run) {
|
||||
printf ("* kill pid for %-5s => %-5d\n", $_, $run{$_});
|
||||
printf ("* kill pid for %-5s => %-5d\n", $_, $run{$_}) if($verbose);
|
||||
stopserver($run{$_}); # the pid file is in the hash table
|
||||
}
|
||||
ftpkillslaves();
|
||||
ftpkillslaves($verbose);
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
|
Loading…
Reference in New Issue
Block a user