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

svn:r935

4 files changed, 5 insertions, 19 deletions

diff --git a/src/common/log.c b/src/common/log.c
index 397d27aaf..791883c16 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -24,25 +24,24 @@ 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
  * of 'logv' so that we never format a message more than once.
  */
 static INLINE void format_msg(char *buf, size_t buf_len,
-			      int severity, const char *funcname, 
-			      const char *format, va_list ap) 
+                              int severity, const char *funcname, 
+                              const char *format, va_list ap) 
 {
   time_t t;
   struct timeval now;
   int n;
 
   buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */
-  
+
   tor_gettimeofday(&now);
   t = (time_t)now.tv_sec;
-  
+
   n = strftime(buf, buf_len, "%b %d %H:%M:%S", localtime(&t));
   n += snprintf(buf+n, buf_len-n,
                 ".%.3ld [%s] ", 
@@ -71,10 +70,8 @@ logv(int severity, const char *funcname, const char *format, va_list ap)
   char buf[10024];
   int formatted = 0;
   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, ...)
 {
diff --git a/src/common/log.h b/src/common/log.h
index 3927629c8..dace715d4 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -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();
diff --git a/src/or/main.c b/src/or/main.c
index ba4fedb2c..a03a7379d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -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);
diff --git a/src/or/test.c b/src/or/test.c
index 5d395d0f4..a24814128 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -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();