Commit a5aa80cc authored by Roger Dingledine's avatar Roger Dingledine
Browse files

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


svn:r935
parent a0f16c61

src/common/log.c

+5 −14
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ static INLINE const char *sev_to_string(int severity) { 
  }

}



static int loglevel = LOG_DEBUG;

static logfile_t *logfiles = NULL;



/* Format a log message into a fixed-sized buffer. (This is factored out
@@ -73,8 +72,6 @@ logv(int severity, const char *funcname, const char *format, va_list ap) 
  logfile_t *lf;



  assert(format);

  if (severity < loglevel)

    return;

  for (lf = logfiles; lf; lf = lf->next) {

    if (severity < lf->loglevel || severity > lf->max_loglevel)

      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 */

void _log(int severity, const char *format, ...)

{

src/common/log.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#define CHECK_PRINTF(formatIdx, firstArg) 

#endif 



void log_set_severity(int severity);



void add_stream_log(int loglevel, const char *name, FILE *stream);

int add_file_log(int severity, const char *filename);

void close_logs();

src/or/main.c

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ static int init_from_config(int argc, char **argv) { 
    log_fn(LOG_ERR,"Reading config failed. For usage, try -h.");

    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 */

  if(!options.LogFile && !options.RunAsDaemon)

    add_stream_log(options.loglevel, "<stdout>", stdout);

src/or/test.c

+0 −2
Original line number Diff line number Diff line
@@ -589,7 +589,6 @@ test_dir_format() 
                                                    &pk3_str_len));



  memset(buf, 0, 2048);

  log_set_severity(LOG_WARN);

  test_assert(router_dump_router_to_string(buf, 2048, &r1, pk2)>0);

  

  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))

    exit(1);

#endif

  log_set_severity(LOG_ERR);         /* make logging quieter */



  crypto_seed_rng();