[or-cvs] [tor/release-0.2.2] Don't call flush_pending_log_callbacks while logging LD_NOCB messages.

[arma at torproject.org]

commit 4a9d60734ce47cb3b5cb254e522116cd26b4823f
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Sat Dec 11 04:41:35 2010 -0800

    Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
    
    Found by boboper.
---
 src/common/log.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/common/log.c b/src/common/log.c
index f26c5ef..f63c3fb 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;