Revert my addition of callback cleaner and instead use existing functionality for...

diff --git a/src/common/log.c b/src/common/log.c
index 02ad7142e295b46483c077c56b84e34c6794157f..e0bfcf883c063f8e4cc2520a9e56a0b633aee756 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -889,29 +889,6 @@ add_temp_log(int min_severity)
   UNLOCK_LOGS();
 }
 
-#define CALLBACK_FILENAME "<callback>"
-
-/**
- * Removes the latest log handler added, if that log handler is a callback
- * handler.
- */
-void
-remove_log_callback(void)
-{
-  if(logfiles && !strcmp(logfiles->filename, CALLBACK_FILENAME)) {
-    logfile_t *lf = logfiles;
-
-    LOCK_LOGS();
-    logfiles = lf->next;
-    log_global_min_severity_ = get_min_log_level();
-    UNLOCK_LOGS();
-
-    tor_free(lf->filename);
-    tor_free(lf->severities);
-    tor_free(lf);
-  }
-}
-
 /**
  * Add a log handler to send messages in <b>severity</b>
  * to the function <b>cb</b>.
@@ -923,7 +900,7 @@ add_callback_log(const log_severity_list_t *severity, log_callback cb)
   lf = tor_malloc_zero(sizeof(logfile_t));
   lf->fd = -1;
   lf->severities = tor_memdup(severity, sizeof(log_severity_list_t));
-  lf->filename = tor_strdup(CALLBACK_FILENAME);
+  lf->filename = tor_strdup("<callback>");
   lf->callback = cb;
   lf->next = logfiles;
 

diff --git a/src/common/torlog.h b/src/common/torlog.h
index f72263c85feab3a62d1d1c232891c2bdc948d4a0..53e3984f63bd10ecdc99604591a54ad0549cfc53 100644 (file)
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -138,7 +138,6 @@ int add_file_log(const log_severity_list_t *severity, const char *filename,
 int add_syslog_log(const log_severity_list_t *severity,
                    const char* syslog_identity_tag);
 #endif
-void remove_log_callback(void);
 int add_callback_log(const log_severity_list_t *severity, log_callback cb);
 void logs_set_domain_logging(int enabled);
 int get_min_log_level(void);

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 76e9bdac94d3260b7ca510f8c22775b72692b452..693b3dacb7b61a778f6aac682a8cf7cbb783cb78 100644 (file)
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -50,6 +50,7 @@ setup_log_callback(void)
   lst.masks[LOG_WARN - LOG_ERR] = ~0;
   lst.masks[LOG_NOTICE - LOG_ERR] = ~0;
   add_callback_log(&lst, log_cback);
+  mark_logs_temp();
 }
 
 static char *
@@ -200,7 +201,7 @@ test_options_validate(void *arg)
            "We're a bridge but DirCache is disabled.");
 
   clear_log_messages();
-  remove_log_callback();
+  close_temp_logs();
   return;
 }