util: fix file descriptor leak in mrafs-style logging

[openafs.git] / src / util / serverLog.c

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 90dd452..4ce8460 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -76,6 +76,8 @@ static int threadIdLogs = 0;
 static int resetSignals = 0;
 static char *ourName = NULL;
 
+static void RotateLogFile(void);
+
 void
 SetLogThreadNumProgram(int (*func) (void) )
 {
@@ -268,11 +270,7 @@ ResetDebug_Signal(int signo)
         threadIdLogs = 0;
 #endif
     if (mrafsStyleLogs) {
-       LOCK_SERVERLOG();
-       if (ourName != NULL) {
-           OpenLog(ourName);
-       }
-       UNLOCK_SERVERLOG();
+       RotateLogFile();
     }
 }                              /*ResetDebug_Signal */
 
@@ -462,6 +460,23 @@ ReOpenLog(const char *fileName)
 }
 
 /*!
+ * Rotate the log file by renaming then truncating.
+ */
+static void
+RotateLogFile(void)
+{
+    LOCK_SERVERLOG();
+    if (ourName != NULL) {
+       if (serverLogFD >= 0) {
+           close(serverLogFD);
+           serverLogFD = -1;
+       }
+       OpenLog(ourName);
+    }
+    UNLOCK_SERVERLOG();
+}
+
+/*!
  * Close the server log file.
  *
  * \note Must be preceeded by OpenLog().