[chromedriver] Logging tweaks and fixes.

chrome/test/chromedriver/logging.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/logging.h"
 
 #include <stdio.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 59 matching lines @@
     case logging::LOG_WARNING:
       return Log::kWarning;
     case logging::LOG_INFO:
       return Log::kInfo;
     case logging::LOG_VERBOSE:
     default:
       return Log::kDebug;
   }
 }
 
+WebDriverLog* GetSessionLog() {
+  Session* session = GetThreadLocalSession();
+  if (!session)
+    return NULL;
+  return session->driver_log.get();
+}
+
 bool InternalIsVLogOn(int vlog_level) {
-  return GetLevelFromSeverity(vlog_level * -1) >= g_log_level;
+  WebDriverLog* session_log = GetSessionLog();
+  Log::Level session_level = session_log ? session_log->min_level() : Log::kOff;
+  Log::Level level = g_log_level < session_level ? g_log_level : session_level;
+  return GetLevelFromSeverity(vlog_level * -1) >= level;
 }
 
 bool HandleLogMessage(int severity,
                       const char* file,
                       int line,
                       size_t message_start,
                       const std::string& str) {
   Log::Level level = GetLevelFromSeverity(severity);
-  if (level < g_log_level)
-    return true;
+  std::string message = str.substr(message_start);
 
-  std::string message = str.substr(message_start);
-  const char* level_name = "UNKNOWN";
-  switch (level) {
-    case Log::kDebug:
-      level_name = "DEBUG";
-      break;
-    case Log::kInfo:
-      level_name = "INFO";
-      break;
-    case Log::kWarning:
-      level_name = "WARNING";
-      break;
-    case Log::kError:
-      level_name = "ERROR";
-      break;
-    default:
-      break;
+  if (level >= g_log_level) {
+    const char* level_name = LevelToName(level);
+    std::string entry = base::StringPrintf(
+        "[%.3lf][%s]: %s",
+        base::TimeDelta(base::TimeTicks::Now() -
+                        base::TimeTicks::FromInternalValue(g_start_time))
+            .InSecondsF(),
+        level_name,
+        message.c_str());
+    fprintf(stderr, "%s", entry.c_str());
+    fflush(stderr);
   }
-  std::string entry = base::StringPrintf(
-      "[%.3lf][%s]: %s",
-      base::TimeDelta(base::TimeTicks::Now() -
-                      base::TimeTicks::FromInternalValue(g_start_time))
-          .InSecondsF(),
-      level_name,
-      message.c_str());
 
-  fprintf(stderr, "%s", entry.c_str());
-  fflush(stderr);
+  WebDriverLog* session_log = GetSessionLog();
+  if (session_log)
+    session_log->AddEntry(level, message);
+
   return true;
 }
 
 }  // namespace
 
 bool WebDriverLog::NameToLevel(const std::string& name, Log::Level* out_level) {
   for (size_t i = 0; i < arraysize(kNameToLevel); ++i) {
     if (name == kNameToLevel[i].name) {
       *out_level = kNameToLevel[i].level;
       return true;
@@ skipping 128 matching lines @@
 
   // Create "driver" log -- should always exist.
   scoped_ptr<WebDriverLog> driver_log(
       new WebDriverLog(kDriverLogType, driver_log_level));
 
   out_logs->swap(logs);
   *out_driver_log = driver_log.Pass();
   out_listeners->swap(listeners);
   return Status(kOk);
 }