Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Unified Diff: remoting/host/native_messaging/log_message_handler.cc

Issue 2034393004: Allow multiple logging::LogMessage{Handler,Listener}s Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments, deque for listeners, reentrant test Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/native_messaging/log_message_handler.cc
diff --git a/remoting/host/native_messaging/log_message_handler.cc b/remoting/host/native_messaging/log_message_handler.cc
index e2e3cd8b58c67d9c116d172610dba878b52c5fdf..95315caaba87893f969d279c10808837ae7c9f68 100644
--- a/remoting/host/native_messaging/log_message_handler.cc
+++ b/remoting/host/native_messaging/log_message_handler.cc
@@ -36,31 +36,22 @@ LogMessageHandler::LogMessageHandler(
LOG(FATAL) << "LogMessageHandler is already registered. Only one instance "
<< "per process is allowed.";
}
- previous_log_message_handler_ = logging::GetLogMessageHandler();
- logging::SetLogMessageHandler(&LogMessageHandler::OnLogMessage);
g_log_message_handler = this;
}
LogMessageHandler::~LogMessageHandler() {
base::AutoLock lock(g_log_message_handler_lock.Get());
- if (logging::GetLogMessageHandler() != &LogMessageHandler::OnLogMessage) {
- LOG(FATAL) << "LogMessageHandler is not the top-most message handler. "
- << "Cannot unregister.";
- }
- logging::SetLogMessageHandler(previous_log_message_handler_);
g_log_message_handler = nullptr;
}
// static
const char* LogMessageHandler::kDebugMessageTypeName = "_debug_log";
-// static
-bool LogMessageHandler::OnLogMessage(
- logging::LogSeverity severity,
- const char* file,
- int line,
- size_t message_start,
- const std::string& str) {
+bool LogMessageHandler::OnMessage(logging::LogSeverity severity,
+ const char* file,
+ int line,
+ size_t message_start,
+ const std::string& str) {
base::AutoLock lock(g_log_message_handler_lock.Get());
if (g_log_message_handler) {
g_log_message_handler->PostLogMessageToCorrectThread(

Powered by Google App Engine
This is Rietveld 408576698