From b58eacc9b1aa84504b4d749e345c54d0bf237f23 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 21 Apr 2008 18:48:07 +0000
Subject: [PATCH] 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
---
 xCAT-server-2.0/sbin/xcatd | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xCAT-server-2.0/sbin/xcatd b/xCAT-server-2.0/sbin/xcatd
index 920bc3ca2..1cedc708d 100755
--- a/xCAT-server-2.0/sbin/xcatd
+++ b/xCAT-server-2.0/sbin/xcatd
@@ -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" };