Splitted open_logfiles(); into open_logfiles(); and close_logfiles();, use the second...

diff --git a/include/logger.h b/include/logger.h
index ee6ca3a935bf382ab1c5529d24710a75edd37c33..6efa0ca4835924f59384dda49143573602299fcb 100644 (file)
--- a/include/logger.h
+++ b/include/logger.h
@@ -55,6 +55,7 @@ struct Client;
 
 extern void init_main_logfile(void);
 extern void open_logfiles(void);
+extern void close_logfiles(void);
 extern void ilog(ilogfile dest, const char *fmt, ...) AFP(2, 3);
 extern void inotice(const char *fmt, ...) AFP(1, 2);
 extern void iwarn(const char *fmt, ...) AFP(1, 2);

diff --git a/src/ircd.c b/src/ircd.c
index af922db13e7efec023d0060a8d46c41afa49c08f..7094d0779c0f7696b7fa7baecdd6f0d5123a39f5 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -164,6 +164,7 @@ ircd_shutdown(const char *reason)
        }
 
        ilog(L_MAIN, "Server Terminating. %s", reason);
+       close_logfiles();
 
        unlink(pidFileName);
        exit(0);

diff --git a/src/logger.c b/src/logger.c
index 3fea75b58e4f4d67353d8aedee480d85a003c4c3..2246f25a501a8365c99e46f4bb60caa98e4ed3c0 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -86,26 +86,37 @@ open_logfiles(void)
 {
        int i;
 
-       if(log_main != NULL)
-               fclose(log_main);
+       close_logfiles();
 
        log_main = fopen(logFileName, "a");
 
        /* log_main is handled above, so just do the rest */
        for(i = 1; i < LAST_LOGFILE; i++)
        {
-               /* close open logfiles */
+               /* reopen those with paths */
+               if(!EmptyString(*log_table[i].name))
+                       *log_table[i].logfile = fopen(*log_table[i].name, "a");
+       }
+}                      
+
+void
+close_logfiles(void)
+{
+       int i;
+
+       if(log_main != NULL)
+               fclose(log_main);
+
+       /* log_main is handled above, so just do the rest */
+       for(i = 1; i < LAST_LOGFILE; i++)
+       {
                if(*log_table[i].logfile != NULL)
                {
                        fclose(*log_table[i].logfile);
                        *log_table[i].logfile = NULL;
                }
-
-               /* reopen those with paths */
-               if(!EmptyString(*log_table[i].name))
-                       *log_table[i].logfile = fopen(*log_table[i].name, "a");
        }
-}                      
+}
 
 void
 ilog(ilogfile dest, const char *format, ...)