Skip to content
Snippets Groups Projects
Commit 957c258c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

no, the kill servers messages need to be verbose, they're too frequent

parent abee109c
No related branches found
No related tags found
No related merge requests found
# 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);
}
#######################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment