Skip to content

Opt log function name #3017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenBright merged 1 commit into from
Jul 7, 2025
Merged

Opt log function name #3017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions src/butil/logging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ DEFINE_bool(log_hostname, false, "Add host after pid in each log so"

DEFINE_bool(log_year, false, "Log year in datetime part in each log");

DEFINE_bool(log_func_name, false, "Log function name in each log");
DEFINE_bool(log_func_name, false, "[DEPRECATED]Log function name in each log. "
Comment thread
chenBright marked this conversation as resolved.
"Now DefaultLogSink logs function names by default. "
"Customized LogSink can also log function names through "
"corresponding OnLogMessage.");

DEFINE_bool(async_log, false, "Use async log");

Expand Down Expand Up @@ -1381,14 +1384,8 @@ void LogStream::FlushWithoutReset() {
DoublyBufferedLogSink::ScopedPtr ptr;
if (DoublyBufferedLogSink::GetInstance()->Read(&ptr) == 0 &&
(*ptr) != NULL) {
bool result = false;
if (FLAGS_log_func_name) {
result = (*ptr)->OnLogMessage(_severity, _file, _line,
_func, content());
} else {
result = (*ptr)->OnLogMessage(_severity, _file,
_line, content());
}
bool result = (*ptr)->OnLogMessage(
_severity, _file, _line, _func, content());
if (result) {
goto FINISH_LOGGING;
}
Expand All @@ -1408,13 +1405,8 @@ void LogStream::FlushWithoutReset() {
}
#endif
if (!tried_default) {
if (FLAGS_log_func_name) {
DefaultLogSink::GetInstance()->OnLogMessage(
_severity, _file, _line, _func, content());
} else {
DefaultLogSink::GetInstance()->OnLogMessage(
_severity, _file, _line, content());
}
DefaultLogSink::GetInstance()->OnLogMessage(
_severity, _file, _line, _func, content());
}

FINISH_LOGGING:
Expand Down
4 changes: 2 additions & 2 deletions src/butil/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ class LogSink {
virtual bool OnLogMessage(int severity, const char* file, int line,
const butil::StringPiece& log_content) = 0;
virtual bool OnLogMessage(int severity, const char* file,
int line, const char* func,
int line, const char* /*func*/,
const butil::StringPiece& log_content) {
return true;
return OnLogMessage(severity, file, line, log_content);
}
private:
DISALLOW_COPY_AND_ASSIGN(LogSink);
Expand Down
Loading