xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 10:06:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #741 from hu-weihua/umask

Browse Source 
Fix defect #698 Default permissions on commands.log are 644, should change to 600
This commit is contained in:
neo954 2016-03-03 14:00:30 +08:00
commit 56dd49f3a7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xCAT-server/sbin/xcatd
View File

@ -1053,6 +1053,7 @@ unless ($cmdlog_svrpid){
my $writing=0;
my $cmdlogfileswitch=0;
my $cmdlogservicefile="/var/run/xcat/cmdlogservice.pid";
my $cmdlog_logfile_umask;
$SIG{USR2} = sub {
while($writing){sleep(0.01);}
@ -1095,7 +1096,7 @@ unless ($cmdlog_svrpid){
}
if(!$trytime){
xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process $$ get HUP signal, reopen commands.log file failed, send TERM signal to kill itself");
kill 2, $$;
kill 'INT', $$;
}else{
xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process $$ get HUP signal, reopen commands.log file");
}
@ -1111,7 +1112,7 @@ unless ($cmdlog_svrpid){
xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process $$ is trying to get port $cmdlog_port");
my $pid = <$cmdlogpidfile>;
if ($pid) {
kill 12, $pid;
kill 'USR2', $pid;
}
close($cmdlogpidfile);
}
@ -1129,23 +1130,24 @@ unless ($cmdlog_svrpid){
exit(0);
}
my $cmdlog_logfile_path=dirname($cmdlog_logfile);
mkpath("$cmdlog_logfile_path") unless(-d "$cmdlog_logfile_path");
unless (open ($cmdlogfile, ">>$cmdlog_logfile")) {
xCAT::MsgUtils->trace(0,"E","xcatd: Can't open xcat command log file $cmdlog_logfile,command log process $$ stop.");
if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
exit(0);
}
select($cmdlogfile);
$|=1;
$cmdlogfileswitch=1;
open($cmdlogpidfile,">$cmdlogservicefile");
print $cmdlogpidfile $$;
close($cmdlogpidfile);
xCAT::MsgUtils->trace(0,"I","xcatd: command log process $$ start");
my $cmdlog_logfile_path=dirname($cmdlog_logfile);
mkpath("$cmdlog_logfile_path") unless(-d "$cmdlog_logfile_path");
$cmdlog_logfile_umask = umask(0077);
unless (open ($cmdlogfile, ">>$cmdlog_logfile")) {
xCAT::MsgUtils->trace(0,"E","xcatd: Can't open xcat command log file $cmdlog_logfile,command log process $$ stop.");
exit(1);
}
umask($cmdlog_logfile_umask);
select($cmdlogfile);
$|=1;
$cmdlogfileswitch=1;
while (1)
{
$clientsock = $cmdlogsvrlistener->accept;