xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

fix some quit problem of command log writer process

Browse Source
This commit is contained in:
huweihua 2015-08-20 20:53:57 -04:00
parent cdd1bbf73e
commit 69ebde1728
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-server/sbin/xcatd
View File

@ -960,9 +960,8 @@ $SIG{TERM} = $SIG{INT} = sub {
}
#----used for command log start---------
if ($cmdlog_svrpid) {
xCAT::MsgUtils->trace(0,"I","xcatd: 'Command log writer' process is killed by parent process");
kill 2, $cmdlog_svrpid;
if ($cmdlog_svrpid)
kill 2, $cmdlog_svrpid;
}
#----used for command log end---------
@ -1158,7 +1157,7 @@ if( !defined($cmdlog_svrpid)){
my $cmdlogfile;
$SIG{TERM} = $SIG{INT} = sub {
xCAT::MsgUtils->trace(0,"I","xcatd: 'Command log writer' process is terminated by TERM or INT signal");
xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process is terminated by TERM or INT signal");
if($cmdlogfile){close($cmdlogfile);}
if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
if($clientsock){close($clientsock);}
@ -3081,7 +3080,7 @@ sub cmdlog_submitlog() {
$tmpreq = $item;
}
}
$tmpreq =~ s/\[Request\](.+)/$1/g;
$tmpreq =~ s/\[Request\]\s+(.+)/$1/g;
if( $tmpreq =~ /getipmicons/) {return 1;}
while ($trytime>0){