From 5713f51bc0cd0d847ef0246c72b59cbce50ff148 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 27 Mar 2019 22:11:20 -0700 Subject: [PATCH] Reset min log levels on each engine launch. --- shell/common/shell.cc | 14 +++++++------- .../platform/embedder/tests/embedder_unittests.cc | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/shell/common/shell.cc b/shell/common/shell.cc index 6ba709e879f19..4d2dcc0d137a6 100644 --- a/shell/common/shell.cc +++ b/shell/common/shell.cc @@ -163,17 +163,17 @@ static void RecordStartupTimestamp() { // that cause shell initialization failures will still lead to some of their // settings being applied. static void PerformInitializationTasks(const blink::Settings& settings) { + { + fml::LogSettings log_settings; + log_settings.min_log_level = + settings.verbose_logging ? fml::LOG_INFO : fml::LOG_ERROR; + fml::SetLogSettings(log_settings); + } + static std::once_flag gShellSettingsInitialization = {}; std::call_once(gShellSettingsInitialization, [&settings] { RecordStartupTimestamp(); - { - fml::LogSettings log_settings; - log_settings.min_log_level = - settings.verbose_logging ? fml::LOG_INFO : fml::LOG_ERROR; - fml::SetLogSettings(log_settings); - } - tonic::SetLogHandler( [](const char* message) { FML_LOG(ERROR) << message; }); diff --git a/shell/platform/embedder/tests/embedder_unittests.cc b/shell/platform/embedder/tests/embedder_unittests.cc index 357a4e71114ab..25f4ed95a9c8d 100644 --- a/shell/platform/embedder/tests/embedder_unittests.cc +++ b/shell/platform/embedder/tests/embedder_unittests.cc @@ -173,7 +173,6 @@ TEST_F(EmbedderTest, CanSpecifyCustomTaskRunner) { thread.GetTaskRunner()->PostTask([&]() { EmbedderConfigBuilder builder(context); - builder.AddCommandLineArgument("--verbose-logging"); const auto task_runner_description = runner.GetEmbedderDescription(); runner.SetForwardingTaskRunner( fml::MessageLoop::GetCurrent().GetTaskRunner());