RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7983 from liewegas/wip-14616

Browse Source 
log: do not repeat errors to stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2016-03-11 10:29:55 -05:00
commit 4ab0fc51d1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/log/Log.cc
View File

@ -53,6 +53,7 @@ Log::Log(SubsystemMap *s)
m_fd(-1),
m_uid(0),
m_gid(0),
m_fd_last_error(0),
m_syslog_log(-2), m_syslog_crash(-2),
m_stderr_log(1), m_stderr_crash(-1),
m_graylog_log(-3), m_graylog_crash(-3),
@ -337,9 +338,13 @@ void Log::_flush(EntryQueue *t, EntryQueue *requeue, bool crash)
if (do_fd) {
buf[buflen] = '\n';
int r = safe_write(m_fd, buf, buflen+1);
if (r < 0)
cerr << "problem writing to " << m_log_file << ": " << cpp_strerror(r)
<< std::endl;
if (r != m_fd_last_error) {
if (r < 0)
cerr << "problem writing to " << m_log_file
<< ": " << cpp_strerror(r)
<< std::endl;
m_fd_last_error = r;
}
}
if (need_dynamic)
delete[] buf;

2
src/log/Log.h
View File

@ -39,6 +39,8 @@ class Log : private Thread
uid_t m_uid;
gid_t m_gid;
int m_fd_last_error; ///< last error we say writing to fd (if any)
int m_syslog_log, m_syslog_crash;
int m_stderr_log, m_stderr_crash;
int m_graylog_log, m_graylog_crash;