OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/chromedriver/logging.h" | 5 #include "chrome/test/chromedriver/logging.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <stdio.h> | 9 #include <stdio.h> |
10 | 10 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 } | 91 } |
92 | 92 |
93 bool InternalIsVLogOn(int vlog_level) { | 93 bool InternalIsVLogOn(int vlog_level) { |
94 WebDriverLog* session_log = GetSessionLog(); | 94 WebDriverLog* session_log = GetSessionLog(); |
95 Log::Level session_level = session_log ? session_log->min_level() : Log::kOff; | 95 Log::Level session_level = session_log ? session_log->min_level() : Log::kOff; |
96 Log::Level level = g_log_level < session_level ? g_log_level : session_level; | 96 Log::Level level = g_log_level < session_level ? g_log_level : session_level; |
97 return GetLevelFromSeverity(vlog_level * -1) >= level; | 97 return GetLevelFromSeverity(vlog_level * -1) >= level; |
98 } | 98 } |
99 | 99 |
100 bool HandleLogMessage(int severity, | 100 bool HandleLogMessage(int severity, |
101 const char* file, | 101 const std::string& file, |
102 int line, | 102 int line, |
103 size_t message_start, | |
104 const std::string& str) { | 103 const std::string& str) { |
105 Log::Level level = GetLevelFromSeverity(severity); | 104 Log::Level level = GetLevelFromSeverity(severity); |
106 std::string message = str.substr(message_start); | 105 std::string message = str.substr(message_start); |
107 | 106 |
108 if (level >= g_log_level) { | 107 if (level >= g_log_level) { |
109 const char* level_name = LevelToName(level); | 108 const char* level_name = LevelToName(level); |
110 std::string entry = base::StringPrintf( | 109 std::string entry = base::StringPrintf( |
111 "[%.3lf][%s]: %s", | 110 "[%.3lf][%s]: %s", |
112 base::TimeDelta(base::TimeTicks::Now() - | 111 base::TimeDelta(base::TimeTicks::Now() - |
113 base::TimeTicks::FromInternalValue(g_start_time)) | 112 base::TimeTicks::FromInternalValue(g_start_time)) |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 g_log_level = Log::kAll; | 230 g_log_level = Log::kAll; |
232 | 231 |
233 // Turn on VLOG for chromedriver. This is parsed during logging::InitLogging. | 232 // Turn on VLOG for chromedriver. This is parsed during logging::InitLogging. |
234 cmd_line->AppendSwitchASCII("vmodule", "*/chrome/test/chromedriver/*=3"); | 233 cmd_line->AppendSwitchASCII("vmodule", "*/chrome/test/chromedriver/*=3"); |
235 | 234 |
236 logging::SetMinLogLevel(logging::LOG_WARNING); | 235 logging::SetMinLogLevel(logging::LOG_WARNING); |
237 logging::SetLogItems(false, // enable_process_id | 236 logging::SetLogItems(false, // enable_process_id |
238 false, // enable_thread_id | 237 false, // enable_thread_id |
239 false, // enable_timestamp | 238 false, // enable_timestamp |
240 false); // enable_tickcount | 239 false); // enable_tickcount |
241 logging::SetLogMessageHandler(&HandleLogMessage); | 240 logging::AddLogMessageHandler(&HandleLogMessage); |
242 | 241 |
243 logging::LoggingSettings logging_settings; | 242 logging::LoggingSettings logging_settings; |
244 logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 243 logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
245 return logging::InitLogging(logging_settings); | 244 return logging::InitLogging(logging_settings); |
246 } | 245 } |
247 | 246 |
248 Status CreateLogs(const Capabilities& capabilities, | 247 Status CreateLogs(const Capabilities& capabilities, |
249 const Session* session, | 248 const Session* session, |
250 ScopedVector<WebDriverLog>* out_logs, | 249 ScopedVector<WebDriverLog>* out_logs, |
251 ScopedVector<DevToolsEventListener>* out_devtools_listeners, | 250 ScopedVector<DevToolsEventListener>* out_devtools_listeners, |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 logs.push_back(browser_log); | 291 logs.push_back(browser_log); |
293 // If the level is OFF, don't even bother listening for DevTools events. | 292 // If the level is OFF, don't even bother listening for DevTools events. |
294 if (browser_log_level != Log::kOff) | 293 if (browser_log_level != Log::kOff) |
295 devtools_listeners.push_back(new ConsoleLogger(browser_log)); | 294 devtools_listeners.push_back(new ConsoleLogger(browser_log)); |
296 | 295 |
297 out_logs->swap(logs); | 296 out_logs->swap(logs); |
298 out_devtools_listeners->swap(devtools_listeners); | 297 out_devtools_listeners->swap(devtools_listeners); |
299 out_command_listeners->swap(command_listeners); | 298 out_command_listeners->swap(command_listeners); |
300 return Status(kOk); | 299 return Status(kOk); |
301 } | 300 } |
OLD | NEW |