diff options
| -rw-r--r-- | src/common/log.c | 76 |
1 files changed, 10 insertions, 66 deletions
diff --git a/src/common/log.c b/src/common/log.c index 8c0a06252..018028de3 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1,67 +1,8 @@ -/* - * log.c - * Logging facilities. - * - * Matej Pfajfar <mp292@cam.ac.uk> - */ +/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* See LICENSE for licensing information */ +/* $Id$ */ -/* - * Changes : - * $Log$ - * Revision 1.3 2002/09/04 00:39:33 arma - * the logs now include a timestamp and severity - * - * the implementation is sort of a kludge..you're welcome to fix it up - * - * Revision 1.2 2002/07/12 18:14:16 montrose - * removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL); - * - * Revision 1.1.1.1 2002/06/26 22:45:50 arma - * initial commit: current code - * - * Revision 1.11 2002/06/14 20:44:57 mp292 - * *** empty log message *** - * - * Revision 1.10 2002/03/12 23:31:36 mp292 - * *** empty log message *** - * - * Revision 1.9 2002/03/02 18:55:50 mp292 - * LOG_DEBUG messages don't print the last errno error anymore. - * - * Revision 1.8 2002/01/26 22:46:48 mp292 - * Reviewd according to Secure-Programs-HOWTO. - * - * Revision 1.7 2002/01/17 15:00:43 mp292 - * Fixed a bug which caused malloc() generate a seg fault. - * - * Revision 1.6 2001/12/12 16:02:55 badbytes - * Minor changes in output format. - * - * Revision 1.5 2001/12/12 06:48:07 badbytes - * Correction - last error message now only shown if severity==LOG_DEBUG. - * - * Revision 1.4 2001/12/12 06:28:46 badbytes - * Modified log() to print error message for last error in addition to the user-specified message. - * - * Revision 1.3 2001/12/07 09:38:03 badbytes - * Tested. - * - * Revision 1.2 2001/12/06 15:43:50 badbytes - * config.c compiles. Proceeding to test it. - * - * Revision 1.1 2001/11/21 23:03:41 mp292 - * log function coded and tested. - * Top-level makefile. - * - */ - -#include <stdio.h> -#include <stdarg.h> -#include <syslog.h> -#include <string.h> -#include <errno.h> -#include <assert.h> -#include <time.h> +#include "../or/or.h" #include "log.h" /* FIXME this whole thing is hacked together. feel free to make it clean. */ @@ -108,9 +49,12 @@ void log(int severity, const char *format, ...) char buf[201]; time_t t; va_list ap; + struct timeval now; + + if (format) { - if ( format ) - { + if(gettimeofday(&now,NULL) < 0) + return; va_start(ap,format); @@ -118,7 +62,7 @@ void log(int severity, const char *format, ...) { t = time(NULL); strftime(buf, 200, "%b %d %H:%M:%S", localtime(&t)); - printf("%s ", buf); + printf("%s.%.3ld ", buf, now.tv_usec / 1000); sev_to_string(buf, 200, severity); printf("[%s] ", buf); vprintf(format,ap); |