xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 12:20:40 +00:00
Code Issues Releases Wiki Activity

enhance command log process for handling TERM signal

Browse Source
This commit is contained in:
huweihua
2015-08-18 23:45:36 -04:00
parent 00c13144fa
commit efb4aff9a5
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xCAT-server/sbin/xcatd
View File

@ -961,6 +961,7 @@ $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;
}
#----used for command log end---------
@ -1153,32 +1154,34 @@ if( !defined($cmdlog_svrpid)){
$$progname="xcatd: Command log writer";
my $clientsock;
my @waittowritepro;
my $cmdlogsvrlistener;
my $cmdlogfile;
$SIG{TERM} = $SIG{INT} = sub {
if ($cmdlog_svrpid) {
kill 2, $cmdlog_svrpid;
}
$SIG{ALRM} = sub { xexit 0; };
alarm(2);
};
xCAT::MsgUtils->trace(0,"I","xcatd: 'Command log writer' process is terminated by TERM or INT signal");
if($cmdlogfile){close($cmdlogfile);}
if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
if($clientsock){close($clientsock);}
exit(0);
};
xCAT::MsgUtils->trace(0,"I","xcatd: command log process start");
unless (open (CMDLOGFILE, ">>$cmdlog_logfile")) {
unless (open ($cmdlogfile, ">>$cmdlog_logfile")) {
xCAT::MsgUtils->trace(0,"E","xcatd: Can't open xcat command log file $cmdlog_logfile");
xCAT::MsgUtils->trace(0,"I","xcatd: command log process stop");
exit(0);
}
select(CMDLOGFILE);
select($cmdlogfile);
$|=1;
my $cmdlogsvrlistener = IO::Socket::INET->new(LocalPort => $cmdlog_port,
$cmdlogsvrlistener = IO::Socket::INET->new(LocalPort => $cmdlog_port,
Type => SOCK_STREAM,
Reuse => 1,
Listen => 8192);
while (1)
{
my $clientsock = $cmdlogsvrlistener->accept;
$clientsock = $cmdlogsvrlistener->accept;
unless ($clientsock) { next; }
my $log = "";
my $bytesread;
@ -1186,11 +1189,11 @@ if( !defined($cmdlog_svrpid)){
$bytesread=sysread($clientsock,$log,65536,length($log))
} while ($bytesread);
close($clientsock);
print CMDLOGFILE $log;
print $cmdlogfile $log;
}
close($cmdlogsvrlistener);
close(CMDLOGFILE);
close($cmdlogfile);
xCAT::MsgUtils->trace(0,"I","xcatd: command log process stop");
}