Loading tests/ftp.pm +19 −9 Original line number Diff line number Diff line Loading @@ -30,23 +30,33 @@ sub checkserver { } ############################################################################# # Make sure no FTP leftovers are still running. Kill all slave processes. # This uses pidfiles since it might be used by other processes. # Kill a specific slave # sub ftpkillslaves { my ($versbose) = @_; for $ext (("", "ipv6")) { for $id (("", "2")) { sub ftpkillslave { my ($id, $ext, $verbose)=@_; my $base; 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) if($verbose); printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext", $pid) if($verbose); kill (9, $pid); # die! } unlink($f); } } ############################################################################# # Make sure no FTP leftovers are still running. Kill all slave processes. # This uses pidfiles since it might be used by other processes. # sub ftpkillslaves { my ($versbose) = @_; for $ext (("", "ipv6")) { for $id (("", "2")) { ftpkillslave ($id, $ext, $verbose); } } } Loading Loading
tests/ftp.pm +19 −9 Original line number Diff line number Diff line Loading @@ -30,23 +30,33 @@ sub checkserver { } ############################################################################# # Make sure no FTP leftovers are still running. Kill all slave processes. # This uses pidfiles since it might be used by other processes. # Kill a specific slave # sub ftpkillslaves { my ($versbose) = @_; for $ext (("", "ipv6")) { for $id (("", "2")) { sub ftpkillslave { my ($id, $ext, $verbose)=@_; my $base; 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) if($verbose); printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext", $pid) if($verbose); kill (9, $pid); # die! } unlink($f); } } ############################################################################# # Make sure no FTP leftovers are still running. Kill all slave processes. # This uses pidfiles since it might be used by other processes. # sub ftpkillslaves { my ($versbose) = @_; for $ext (("", "ipv6")) { for $id (("", "2")) { ftpkillslave ($id, $ext, $verbose); } } } Loading