util: add CloseLog routine to close the server log

Add the missing complement to OpenLog().

Change-Id: I45e7e5d2da3241c163d2d4baa6b386167e90e582
Reviewed-on: http://gerrit.openafs.org/12002
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index eef5c1cd2c7c439158efafc5040e4eee47c2b8c1..90c20fcbc62aaf7b2852f23140a103a2667db3e8 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -56,6 +56,7 @@ extern void FSLog(const char *format, ...)
 extern int OpenLog(const char *filename);
 extern int ReOpenLog(const char *fileName);
 extern void SetupLogSignals(void);
+extern void CloseLog(void);
 
 #ifdef AFS_NT40_ENV
 #ifndef _MFC_VER

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 64f081d6e7c1111288c3d60ec2f9804b8408d239..5a6207b670f699e0781f836b6ead3d865fa0f61d 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -408,3 +408,24 @@ ReOpenLog(const char *fileName)
     UNLOCK_SERVERLOG();
     return serverLogFD < 0 ? -1 : 0;
 }
+
+/*!
+ * Close the server log file.
+ *
+ * \note Must be preceeded by OpenLog().
+ */
+void
+CloseLog(void)
+{
+    LOCK_SERVERLOG();
+#ifndef AFS_NT40_ENV
+    if (serverLogSyslog) {
+       closelog();
+    } else
+#endif
+    if (serverLogFD >= 0) {
+       close(serverLogFD);
+       serverLogFD = -1;
+    }
+    UNLOCK_SERVERLOG();
+}