moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-08 12:28:06 -05:00
Code Issues Releases Wiki Activity

Prevent perl script dying messages in output, since tearing down the pinpong

Browse Source 
server in this way, upon sysread failures, is part of the expected behavior.
This commit is contained in:
Yang Tse 2009-12-14 15:39:15 +00:00
parent a6abbb120e
commit 99daca5a48
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ftpserver.pl
View File

@ -169,13 +169,14 @@ sub sysread_or_die {
logmsg "Error: ftp$ftpdnum$ext sysread error: $!\n"; logmsg "Error: ftp$ftpdnum$ext sysread error: $!\n";
kill(9, $sfpid); kill(9, $sfpid);
waitpid($sfpid, 0); waitpid($sfpid, 0);
logmsg "Exited from sysread_or_die() at $fcaller " .
"line $lcaller. ftp$ftpdnum$ext sysread error: $!\n";
unlink($pidfile); unlink($pidfile);
if($serverlogslocked) { if($serverlogslocked) {
$serverlogslocked = 0; $serverlogslocked = 0;
clear_advisor_read_lock($SERVERLOGS_LOCK); clear_advisor_read_lock($SERVERLOGS_LOCK);
} }
die "Died in sysread_or_die() at $fcaller " . exit;
"line $lcaller. ftp$ftpdnum$ext sysread error: $!\n";
} }
elsif($result == 0) { elsif($result == 0) {
($fcaller, $lcaller) = (caller)[1,2]; ($fcaller, $lcaller) = (caller)[1,2];
@ -183,13 +184,14 @@ sub sysread_or_die {
logmsg "Error: ftp$ftpdnum$ext read zero\n"; logmsg "Error: ftp$ftpdnum$ext read zero\n";
kill(9, $sfpid); kill(9, $sfpid);
waitpid($sfpid, 0); waitpid($sfpid, 0);
logmsg "Exited from sysread_or_die() at $fcaller " .
"line $lcaller. ftp$ftpdnum$ext read zero\n";
unlink($pidfile); unlink($pidfile);
if($serverlogslocked) { if($serverlogslocked) {
$serverlogslocked = 0; $serverlogslocked = 0;
clear_advisor_read_lock($SERVERLOGS_LOCK); clear_advisor_read_lock($SERVERLOGS_LOCK);
} }
die "Died in sysread_or_die() at $fcaller " . exit;
"line $lcaller. ftp$ftpdnum$ext read zero\n";
} }
return $result; return $result;