From 99daca5a48f8bce2b8455acc1693f9542c539f0a Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 14 Dec 2009 15:39:15 +0000
Subject: [PATCH] Prevent perl script dying messages in output, since tearing
down the pinpong server in this way, upon sysread failures, is part of the
expected behavior.
---
tests/ftpserver.pl | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 812f779757..bf76f65dea 100644
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -169,13 +169,14 @@ sub sysread_or_die {
logmsg "Error: ftp$ftpdnum$ext sysread error: $!\n";
kill(9, $sfpid);
waitpid($sfpid, 0);
+ logmsg "Exited from sysread_or_die() at $fcaller " .
+ "line $lcaller. ftp$ftpdnum$ext sysread error: $!\n";
unlink($pidfile);
if($serverlogslocked) {
$serverlogslocked = 0;
clear_advisor_read_lock($SERVERLOGS_LOCK);
}
- die "Died in sysread_or_die() at $fcaller " .
- "line $lcaller. ftp$ftpdnum$ext sysread error: $!\n";
+ exit;
}
elsif($result == 0) {
($fcaller, $lcaller) = (caller)[1,2];
@@ -183,13 +184,14 @@ sub sysread_or_die {
logmsg "Error: ftp$ftpdnum$ext read zero\n";
kill(9, $sfpid);
waitpid($sfpid, 0);
+ logmsg "Exited from sysread_or_die() at $fcaller " .
+ "line $lcaller. ftp$ftpdnum$ext read zero\n";
unlink($pidfile);
if($serverlogslocked) {
$serverlogslocked = 0;
clear_advisor_read_lock($SERVERLOGS_LOCK);
}
- die "Died in sysread_or_die() at $fcaller " .
- "line $lcaller. ftp$ftpdnum$ext read zero\n";
+ exit;
}
return $result;
--
GitLab