Skip to content
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

Jump to bottom

SetLogger should delete previously set custom logger. #853

Merged
merged 2 commits into from
Aug 13, 2022
Merged

SetLogger should delete previously set custom logger. #853

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85f3621
SetLogger should delete previously set custom logger.
anpol Aug 12, 2022
c0fc870
Update src/logging.cc
anpol Aug 13, 2022
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
15 changes: 13 additions & 2 deletions src/logging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,10 @@ class LogDestination {

static LogDestination* log_destination(LogSeverity severity);

base::Logger* GetLoggerImpl() const { return logger_; }
void SetLoggerImpl(base::Logger* logger);
void ResetLoggerImpl() { SetLoggerImpl(&fileobject_); }

LogFileObject fileobject_;
base::Logger* logger_; // Either &fileobject_, or wrapper around it

Expand Down Expand Up @@ -641,10 +645,17 @@ LogDestination::LogDestination(LogSeverity severity,
}

LogDestination::~LogDestination() {
ResetLoggerImpl();
}

void LogDestination::SetLoggerImpl(base::Logger* logger) {
if (logger_ == logger) return;
anpol marked this conversation as resolved.
Show resolved Hide resolved

if (logger_ && logger_ != &fileobject_) {
// Delete user-specified logger set via SetLogger().
delete logger_;
}
logger_ = logger;
}

inline void LogDestination::FlushLogFilesUnsafe(int min_severity) {
Expand Down Expand Up @@ -2017,12 +2028,12 @@ void LogMessage::SendToSyslogAndLog() {

base::Logger* base::GetLogger(LogSeverity severity) {
MutexLock l(&log_mutex);
return LogDestination::log_destination(severity)->logger_;
return LogDestination::log_destination(severity)->GetLoggerImpl();
}

void base::SetLogger(LogSeverity severity, base::Logger* logger) {
MutexLock l(&log_mutex);
LogDestination::log_destination(severity)->logger_ = logger;
LogDestination::log_destination(severity)->SetLoggerImpl(logger);
}

// L < log_mutex. Acquires and releases mutex_.
Expand Down
19 changes: 15 additions & 4 deletions src/logging_custom_prefix_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,11 @@ static void TestExtension() {
struct MyLogger : public base::Logger {
string data;

explicit MyLogger(bool* set_on_destruction)
: set_on_destruction_(set_on_destruction) {}

~MyLogger() { *set_on_destruction_ = true; }

virtual void Write(bool /* should_flush */,
time_t /* timestamp */,
const char* message,
Expand All @@ -852,19 +857,25 @@ struct MyLogger : public base::Logger {
virtual void Flush() { }

virtual uint32 LogSize() { return data.length(); }

private:
bool* set_on_destruction_;
};

static void TestWrapper() {
fprintf(stderr, "==== Test log wrapper\n");

MyLogger my_logger;
bool custom_logger_deleted = false;
MyLogger* my_logger = new MyLogger(&custom_logger_deleted);
base::Logger* old_logger = base::GetLogger(GLOG_INFO);
base::SetLogger(GLOG_INFO, &my_logger);
base::SetLogger(GLOG_INFO, my_logger);
LOG(INFO) << "Send to wrapped logger";
CHECK(strstr(my_logger->data.c_str(), "Send to wrapped logger") != NULL);
FlushLogFiles(GLOG_INFO);
base::SetLogger(GLOG_INFO, old_logger);

CHECK(strstr(my_logger.data.c_str(), "Send to wrapped logger") != NULL);
EXPECT_FALSE(custom_logger_deleted);
base::SetLogger(GLOG_INFO, old_logger);
EXPECT_TRUE(custom_logger_deleted);
}

static void TestErrno() {
Expand Down
19 changes: 15 additions & 4 deletions src/logging_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,11 @@ static void TestExtension() {
struct MyLogger : public base::Logger {
string data;

explicit MyLogger(bool* set_on_destruction)
: set_on_destruction_(set_on_destruction) {}

~MyLogger() { *set_on_destruction_ = true; }

virtual void Write(bool /* should_flush */,
time_t /* timestamp */,
const char* message,
Expand All @@ -863,19 +868,25 @@ struct MyLogger : public base::Logger {
virtual void Flush() { }

virtual uint32 LogSize() { return data.length(); }

private:
bool* set_on_destruction_;
};

static void TestWrapper() {
fprintf(stderr, "==== Test log wrapper\n");

MyLogger my_logger;
bool custom_logger_deleted = false;
MyLogger* my_logger = new MyLogger(&custom_logger_deleted);
base::Logger* old_logger = base::GetLogger(GLOG_INFO);
base::SetLogger(GLOG_INFO, &my_logger);
base::SetLogger(GLOG_INFO, my_logger);
LOG(INFO) << "Send to wrapped logger";
CHECK(strstr(my_logger->data.c_str(), "Send to wrapped logger") != NULL);
FlushLogFiles(GLOG_INFO);
base::SetLogger(GLOG_INFO, old_logger);

CHECK(strstr(my_logger.data.c_str(), "Send to wrapped logger") != NULL);
EXPECT_FALSE(custom_logger_deleted);
base::SetLogger(GLOG_INFO, old_logger);
EXPECT_TRUE(custom_logger_deleted);
}

static void TestErrno() {
Expand Down