nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

make --debuglogfile (or any second log file) work

Browse Source 
svn:r935
This commit is contained in:
Roger Dingledine 2003-12-14 09:58:43 +00:00
parent a0f16c619c
commit a5aa80cc41
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/log.c
View File

@ -24,25 +24,24 @@ static INLINE const char *sev_to_string(int severity) {
} }
} }
static int loglevel = LOG_DEBUG;
static logfile_t *logfiles = NULL; static logfile_t *logfiles = NULL;
/* Format a log message into a fixed-sized buffer. (This is factored out /* Format a log message into a fixed-sized buffer. (This is factored out
* of 'logv' so that we never format a message more than once. * of 'logv' so that we never format a message more than once.
*/ */
static INLINE void format_msg(char *buf, size_t buf_len, static INLINE void format_msg(char *buf, size_t buf_len,
int severity, const char *funcname, int severity, const char *funcname,
const char *format, va_list ap) const char *format, va_list ap)
{ {
time_t t; time_t t;
struct timeval now; struct timeval now;
int n; int n;
buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */ buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */
tor_gettimeofday(&now); tor_gettimeofday(&now);
t = (time_t)now.tv_sec; t = (time_t)now.tv_sec;
n = strftime(buf, buf_len, "%b %d %H:%M:%S", localtime(&t)); n = strftime(buf, buf_len, "%b %d %H:%M:%S", localtime(&t));
n += snprintf(buf+n, buf_len-n, n += snprintf(buf+n, buf_len-n,
".%.3ld [%s] ", ".%.3ld [%s] ",
@ -71,10 +70,8 @@ logv(int severity, const char *funcname, const char *format, va_list ap)
char buf[10024]; char buf[10024];
int formatted = 0; int formatted = 0;
logfile_t *lf; logfile_t *lf;
assert(format); assert(format);
if (severity < loglevel)
return;
for (lf = logfiles; lf; lf = lf->next) { for (lf = logfiles; lf; lf = lf->next) {
if (severity < lf->loglevel || severity > lf->max_loglevel) if (severity < lf->loglevel || severity > lf->max_loglevel)
continue; continue;
@ -91,12 +88,6 @@ logv(int severity, const char *funcname, const char *format, va_list ap)
} }
} }
void
log_set_severity(int severity)
{
loglevel = severity;
}
/* Outputs a message to stdout */ /* Outputs a message to stdout */
void _log(int severity, const char *format, ...) void _log(int severity, const char *format, ...)
{ {

2
src/common/log.h
View File

@ -22,8 +22,6 @@
#define CHECK_PRINTF(formatIdx, firstArg) #define CHECK_PRINTF(formatIdx, firstArg)
#endif #endif
void log_set_severity(int severity);
void add_stream_log(int loglevel, const char *name, FILE *stream); void add_stream_log(int loglevel, const char *name, FILE *stream);
int add_file_log(int severity, const char *filename); int add_file_log(int severity, const char *filename);
void close_logs(); void close_logs();

1
src/or/main.c
View File

@ -400,7 +400,6 @@ static int init_from_config(int argc, char **argv) {
log_fn(LOG_ERR,"Reading config failed. For usage, try -h."); log_fn(LOG_ERR,"Reading config failed. For usage, try -h.");
return -1; return -1;
} }
log_set_severity(options.loglevel); /* assign logging severity level from options */
close_logs(); /* we'll close, then open with correct loglevel if necessary */ close_logs(); /* we'll close, then open with correct loglevel if necessary */
if(!options.LogFile && !options.RunAsDaemon) if(!options.LogFile && !options.RunAsDaemon)
add_stream_log(options.loglevel, "<stdout>", stdout); add_stream_log(options.loglevel, "<stdout>", stdout);

2
src/or/test.c
View File

@ -589,7 +589,6 @@ test_dir_format()
&pk3_str_len)); &pk3_str_len));
memset(buf, 0, 2048); memset(buf, 0, 2048);
log_set_severity(LOG_WARN);
test_assert(router_dump_router_to_string(buf, 2048, &r1, pk2)>0); test_assert(router_dump_router_to_string(buf, 2048, &r1, pk2)>0);
strcpy(buf2, "router Magri testaddr1.foo.bar 9000 9002 9003 1000\n" strcpy(buf2, "router Magri testaddr1.foo.bar 9000 9002 9003 1000\n"
@ -698,7 +697,6 @@ main(int c, char**v){
if(getconfig(c,v,&options)) if(getconfig(c,v,&options))
exit(1); exit(1);
#endif #endif
log_set_severity(LOG_ERR); /* make logging quieter */
crypto_seed_rng(); crypto_seed_rng();