Fix BUGs in client interrupt code that would crop up in syslog

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1137 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-04-21 18:48:07 +00:00
parent e0840e7367
commit b58eacc9b1

View File

@ -744,6 +744,9 @@ sub relay_dispatch {
close($rin);
}
}
unless ($clientintr) {
next;
}
$clientintr=XMLin($clientintr, SuppressEmpty=>undef,ForceArray=>1 );
if ($clientintr->{abortcommand}->[0]) {
foreach (keys %dispatched_children) {
@ -996,10 +999,11 @@ sub service_connection {
}
};
if ($@) { # The eval statement caught a program bug..
unless ($@ =~ /^SIGPIPE/) {
syslog("local4|err","xcatd: possible BUG encountered by xCAT TCP service: ".$@);
} else {
if ($@ =~ /^SIGPIPE/) {
syslog("local4|info","xcatd: Unexpected client disconnect");
} elsif ($@ =~ /abort/) {
} else {
syslog("local4|err","xcatd: possible BUG encountered by xCAT TCP service: ".$@);
}
}
$SIG{ALRM}= sub { die "Failure shutting down" };