Splitted open_logfiles(); into open_logfiles(); and close_logfiles();, use the second one on ircd_shutdown
This commit is contained in:
parent
6972e25a95
commit
359dada2ab
|
@ -55,6 +55,7 @@ struct Client;
|
||||||
|
|
||||||
extern void init_main_logfile(void);
|
extern void init_main_logfile(void);
|
||||||
extern void open_logfiles(void);
|
extern void open_logfiles(void);
|
||||||
|
extern void close_logfiles(void);
|
||||||
extern void ilog(ilogfile dest, const char *fmt, ...) AFP(2, 3);
|
extern void ilog(ilogfile dest, const char *fmt, ...) AFP(2, 3);
|
||||||
extern void inotice(const char *fmt, ...) AFP(1, 2);
|
extern void inotice(const char *fmt, ...) AFP(1, 2);
|
||||||
extern void iwarn(const char *fmt, ...) AFP(1, 2);
|
extern void iwarn(const char *fmt, ...) AFP(1, 2);
|
||||||
|
|
|
@ -164,6 +164,7 @@ ircd_shutdown(const char *reason)
|
||||||
}
|
}
|
||||||
|
|
||||||
ilog(L_MAIN, "Server Terminating. %s", reason);
|
ilog(L_MAIN, "Server Terminating. %s", reason);
|
||||||
|
close_logfiles();
|
||||||
|
|
||||||
unlink(pidFileName);
|
unlink(pidFileName);
|
||||||
exit(0);
|
exit(0);
|
||||||
|
|
29
src/logger.c
29
src/logger.c
|
@ -86,27 +86,38 @@ open_logfiles(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if(log_main != NULL)
|
close_logfiles();
|
||||||
fclose(log_main);
|
|
||||||
|
|
||||||
log_main = fopen(logFileName, "a");
|
log_main = fopen(logFileName, "a");
|
||||||
|
|
||||||
/* log_main is handled above, so just do the rest */
|
/* log_main is handled above, so just do the rest */
|
||||||
for(i = 1; i < LAST_LOGFILE; i++)
|
for(i = 1; i < LAST_LOGFILE; i++)
|
||||||
{
|
{
|
||||||
/* close open logfiles */
|
|
||||||
if(*log_table[i].logfile != NULL)
|
|
||||||
{
|
|
||||||
fclose(*log_table[i].logfile);
|
|
||||||
*log_table[i].logfile = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* reopen those with paths */
|
/* reopen those with paths */
|
||||||
if(!EmptyString(*log_table[i].name))
|
if(!EmptyString(*log_table[i].name))
|
||||||
*log_table[i].logfile = fopen(*log_table[i].name, "a");
|
*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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ilog(ilogfile dest, const char *format, ...)
|
ilog(ilogfile dest, const char *format, ...)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue