From: Robert Ransom <rransom.8774@gmail.com>
Date: Sat, 11 Dec 2010 12:41:35 +0000 (-0800)
Subject: Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
X-Git-Tag: tor-0.2.2.21-alpha~7^2~27^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a9d60734ce47cb3b5cb254e522116cd26b4823f;p=thirdparty%2Ftor.git

Don't call flush_pending_log_callbacks while logging LD_NOCB messages.

Found by boboper.
---

diff --git a/src/common/log.c b/src/common/log.c
index f26c5ef34a..f63c3fb9b4 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -280,7 +280,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
   assert(severity >= LOG_ERR && severity <= LOG_DEBUG);
   LOCK_LOGS();
 
-  if (smartlist_len(pending_cb_messages))
+  if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages))
     flush_pending_log_callbacks();
 
   lf = logfiles;