RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

log: simplify log logic a bit

Browse Source 
Whether an entry is eligible to log/dump is independent of the channel it
is sent to.  Some channels impose additional restrictions.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-07-16 16:18:51 -07:00
parent abe05a3fbb
commit 36d0a3555f
1 changed files with 4 additions and 6 deletions

10
src/log/Log.cc
View File

@ -188,12 +188,10 @@ void Log::_flush(EntryQueue *t, EntryQueue *requeue, bool crash)
while ((e = t->dequeue()) != NULL) {
unsigned sub = e->m_subsys;
bool should_log = m_subs->get_log_level(sub) >= e->m_prio;
bool do_fd = m_fd >= 0 && (crash || should_log);
bool do_syslog = crash ? (m_syslog_crash >= e->m_prio) :
(m_syslog_crash >= e->m_prio && should_log);
bool do_stderr = crash ? (m_stderr_crash >= e->m_prio) :
(m_stderr_crash >= e->m_prio && should_log);
bool should_log = crash || m_subs->get_log_level(sub) >= e->m_prio;
bool do_fd = m_fd >= 0 && should_log;
bool do_syslog = m_syslog_crash >= e->m_prio && should_log;
bool do_stderr = m_stderr_crash >= e->m_prio && should_log;
if (do_fd || do_syslog || do_stderr) {
int buflen = 0;