From 45a31d9bb87185d67041065c493d8de0829998bc Mon Sep 17 00:00:00 2001
From: huweihua <huweihua@cn.ibm.com>
Date: Tue, 15 Sep 2015 04:19:55 -0400
Subject: [PATCH] modify some code depending on xiaopeng's comments

---
 xCAT-server/sbin/xcatd | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index cbf94ca04..4eed89858 100644
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1056,8 +1056,8 @@ unless ($cmdlog_svrpid){
         while($writing){sleep(0.01);}
         if($cmdlogfile){close($cmdlogfile);}
         if($clientsock){close($clientsock);}
-        if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
         if( -e $cmdlogservicefile){ unlink("$cmdlogservicefile");}
+        if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
         xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process $$ is terminated by USR2 signal");		
         exit(0);
     };  
@@ -1066,12 +1066,15 @@ unless ($cmdlog_svrpid){
         while($writing){sleep(0.01);}
         if($cmdlogfile){close($cmdlogfile);}
         if($clientsock){close($clientsock);}
-        if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
         if( -e $cmdlogservicefile){ unlink("$cmdlogservicefile");}
+        if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
         xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process $$ is terminated by TERM or INT signal");
         exit(0);
     };  
 
+    #To support another separate feature "logrotate", that feature will change commands.log name every certain time.
+    #when it changes the commands.log name, it will send HUP signal to 'command log writer' process.
+    #so when 'command log writer' process receives the HUP siganl, it should reopen the commands.log to make log writing correctly.
     $SIG{HUP} = sub {
         my $trytime=200;
         while($writing){sleep(0.01);}
@@ -1158,7 +1161,6 @@ unless ($cmdlog_svrpid){
 
     if($cmdlogfile){close($cmdlogfile);}
     if($cmdlogsvrlistener){close($cmdlogsvrlistener);}
-    if( -e $cmdlogservicefile){ unlink("$cmdlogservicefile");}
     xCAT::MsgUtils->message("S","INFO xcatd: 'Command log writer' process $$ stop");
 }
 #----used for command log end---------