diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2010-12-11 04:41:35 -0800 |
|---|---|---|
| committer | Robert Ransom <rransom.8774@gmail.com> | 2010-12-11 04:41:35 -0800 |
| commit | 4a9d60734ce47cb3b5cb254e522116cd26b4823f (patch) | |
| tree | 2882ee2178cdbd4d55321782c1dfa7ec910ff5e2 | |
| parent | d166d18643197c57ba98d3a476df26c605554b26 (diff) | |
| download | tor-4a9d60734ce47cb3b5cb254e522116cd26b4823f.tar tor-4a9d60734ce47cb3b5cb254e522116cd26b4823f.tar.gz | |
Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
Found by boboper.
| -rw-r--r-- | 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 f26c5ef34..f63c3fb9b 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; |