From e7c5580a104cd2e2e93249f02b275386dc0b14d4 Mon Sep 17 00:00:00 2001 From: huweihua Date: Fri, 28 Aug 2015 04:12:14 -0400 Subject: [PATCH] change fork ot xfork for command log process --- xCAT-server/sbin/xcatd | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 4b8590e3c..7e63f8e4f 100644 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -1006,7 +1006,7 @@ unless ($pid_UDP) { if ($pid_disco) { kill 2, $pid_disco; } - $SIG{ALRM} = sub { xexit 0; }; #die "Did not close out in time for 2 second grace period"; }; + $SIG{ALRM} = sub { xexit 0; }; #die "Did not close out in time for 2 second grace period"; alarm(2); }; @@ -1035,11 +1035,12 @@ unless ($pid_MON) { } #----used for command log start--------- -$cmdlog_svrpid = fork(); -if( !defined($cmdlog_svrpid)){ +$cmdlog_svrpid = xCAT::Utils->xfork; +if (! defined $cmdlog_svrpid) { print "xCAT command log sever unable to fork"; xCAT::MsgUtils->message("S","xCAT command log sever unable to fork"); -}elsif($cmdlog_svrpid ==0){ +} +unless ($cmdlog_svrpid){ $$progname="xcatd: Command log writer"; my $clientsock; my @waittowritepro;