bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(log_message): Changed the code so that the log is opened, written, and closed whenever a message is submitted. This allows the log file to be moved away, for example a rotating the log, and yet still have the information written to the correct file name by all the children.

Browse Source
This commit is contained in:
Robert James Kaes 2002-06-15 17:37:11 +00:00
parent ac5d67c11a
commit f0d7992765
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/log.c
View File

@ -1,4 +1,4 @@
/* $Id: log.c,v 1.21 2002-06-06 20:24:21 rjkaes Exp $ /* $Id: log.c,v 1.22 2002-06-15 17:37:11 rjkaes Exp $
* *
* Logs the various messages which tinyproxy produces to either a log file or * Logs the various messages which tinyproxy produces to either a log file or
* the syslog daemon. Not much to it... * the syslog daemon. Not much to it...
@ -22,6 +22,7 @@
#include "hashmap.h" #include "hashmap.h"
#include "heap.h" #include "heap.h"
#include "log.h" #include "log.h"
#include "utils.h"
static char *syslog_level[] = { static char *syslog_level[] = {
NULL, NULL,
@ -68,7 +69,6 @@ log_message(int level, char *fmt, ...)
{ {
va_list args; va_list args;
time_t nowtime; time_t nowtime;
FILE *cf;
char time_string[TIME_LENGTH]; char time_string[TIME_LENGTH];
#if defined(HAVE_SYSLOG_H) && !defined(HAVE_VSYSLOG_H) #if defined(HAVE_SYSLOG_H) && !defined(HAVE_VSYSLOG_H)
@ -130,19 +130,23 @@ log_message(int level, char *fmt, ...)
# endif # endif
} else { } else {
#endif #endif
FILE* log_file;
int fd;
fd = create_file_safely(config.logf_name, FALSE);
log_file = fdopen(fd, "w+");
nowtime = time(NULL); nowtime = time(NULL);
/* Format is month day hour:minute:second (24 time) */ /* Format is month day hour:minute:second (24 time) */
strftime(time_string, TIME_LENGTH, "%b %d %H:%M:%S", strftime(time_string, TIME_LENGTH, "%b %d %H:%M:%S",
localtime(&nowtime)); localtime(&nowtime));
if (!(cf = config.logf)) fprintf(log_file, "%-9s %s [%ld]: ", syslog_level[level],
cf = stderr;
fprintf(cf, "%-9s %s [%ld]: ", syslog_level[level],
time_string, (long int) getpid()); time_string, (long int) getpid());
vfprintf(cf, fmt, args); vfprintf(log_file, fmt, args);
fprintf(cf, "\n"); fprintf(log_file, "\n");
fflush(cf);
fclose(log_file);
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
} }
#endif #endif