aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-01-02 05:38:53 +0000
committerNick Mathewson <nickm@torproject.org>2008-01-02 05:38:53 +0000
commitc0ec2815652842bdb2b533c2a8ddd125f26730fb (patch)
treee78f5db19a5bbb0634b39a0ad8172d6cd4029795 /src/or
parentfeb1c60e9d4cf6f3f17feabd7278ace97c5fd3ed (diff)
downloadtor-c0ec2815652842bdb2b533c2a8ddd125f26730fb.tar
tor-c0ec2815652842bdb2b533c2a8ddd125f26730fb.tar.gz
r15784@tombo: nickm | 2008-01-02 00:38:06 -0500
Fix bug 575: protect the list of logs with a mutex. I couldn't find any appreciable change in logging performance on osx, but ymmv. You can undef USE_LOG_MUTEX to see if stuff gets faster for you. svn:r13019
Diffstat (limited to 'src/or')
-rw-r--r--src/or/main.c1
-rw-r--r--src/or/test.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index c9ac54dc8..22c3175e6 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1945,6 +1945,7 @@ tor_main(int argc, char *argv[])
_tor_dmalloc_free);
log_notice(LD_CONFIG, "Set up dmalloc; returned %d", r);
#endif
+ init_logging();
#ifdef NT_SERVICE
{
int done = 0;
diff --git a/src/or/test.c b/src/or/test.c
index fed412816..23bae4820 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -3504,6 +3504,8 @@ main(int c, char**v)
int verbose = 0, any_selected = 0;
int loglevel = LOG_ERR;
+ init_logging();
+
for (i = 1; i < c; ++i) {
if (!strcmp(v[i], "-v") || !strcmp(v[i], "--verbose"))
verbose++;