Revert 88492 - In chromedriver, add /log url to get the contents of the chromedriver log

chrome/test/webdriver/server.cc

 // Copyright (c) 2011 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 <signal.h>
 #include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <iostream>
 #include <fstream>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/webdriver/dispatch.h"
+#include "chrome/test/webdriver/session_manager.h"
+#include "chrome/test/webdriver/utility_functions.h"
 #include "chrome/test/webdriver/commands/alert_commands.h"
 #include "chrome/test/webdriver/commands/cookie_commands.h"
 #include "chrome/test/webdriver/commands/create_session.h"
 #include "chrome/test/webdriver/commands/execute_async_script_command.h"
 #include "chrome/test/webdriver/commands/execute_command.h"
 #include "chrome/test/webdriver/commands/find_element_commands.h"
 #include "chrome/test/webdriver/commands/navigate_commands.h"
 #include "chrome/test/webdriver/commands/mouse_commands.h"
 #include "chrome/test/webdriver/commands/screenshot_command.h"
 #include "chrome/test/webdriver/commands/session_with_id.h"
 #include "chrome/test/webdriver/commands/set_timeout_commands.h"
 #include "chrome/test/webdriver/commands/source_command.h"
 #include "chrome/test/webdriver/commands/target_locator_commands.h"
 #include "chrome/test/webdriver/commands/title_command.h"
 #include "chrome/test/webdriver/commands/url_command.h"
 #include "chrome/test/webdriver/commands/webelement_commands.h"
-#include "chrome/test/webdriver/dispatch.h"
-#include "chrome/test/webdriver/session_manager.h"
-#include "chrome/test/webdriver/utility_functions.h"
-#include "chrome/test/webdriver/webdriver_logging.h"
 #include "third_party/mongoose/mongoose.h"
 
 #if defined(OS_WIN)
 #include <time.h>
 #elif defined(OS_POSIX)
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #endif
 
 namespace webdriver {
 
 void InitCallbacks(struct mg_context* ctx, Dispatcher* dispatcher,
                    base::WaitableEvent* shutdown_event,
                    bool forbid_other_requests) {
   dispatcher->AddShutdown("/shutdown", shutdown_event);
-  dispatcher->AddHealthz("/healthz");
-  dispatcher->AddLog("/log");
+  dispatcher->AddStatus("/healthz");
 
   dispatcher->Add<CreateSession>("/session");
 
   // WebElement commands
   dispatcher->Add<FindOneElementCommand>(  "/session/*/element");
   dispatcher->Add<FindManyElementsCommand>("/session/*/elements");
   dispatcher->Add<ActiveElementCommand>(   "/session/*/element/active");
   dispatcher->Add<FindOneElementCommand>(  "/session/*/element/*/element");
   dispatcher->Add<FindManyElementsCommand>("/session/*/elements/*/elements");
   dispatcher->Add<ElementAttributeCommand>("/session/*/element/*/attribute/*");
@@ skipping 59 matching lines @@
   // Since the /session/* is a wild card that would match the above URIs, this
   // line MUST be after all other webdriver command callbacks.
   dispatcher->Add<SessionWithID>("/session/*");
 
   if (forbid_other_requests)
     dispatcher->ForbidAllOtherRequests();
 }
 
 }  // namespace webdriver
 
+// Initializes logging for ChromeDriver.
+void InitChromeDriverLogging(const CommandLine& command_line) {
+  bool success = InitLogging(
+      FILE_PATH_LITERAL("chromedriver.log"),
+      logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
+      logging::LOCK_LOG_FILE,
+      logging::DELETE_OLD_LOG_FILE,
+      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  if (!success) {
+    PLOG(ERROR) << "Unable to initialize logging";
+  }
+  logging::SetLogItems(false,  // enable_process_id
+                       false,  // enable_thread_id
+                       true,   // enable_timestamp
+                       false); // enable_tickcount
+  if (command_line.HasSwitch(switches::kLoggingLevel)) {
+    std::string log_level = command_line.GetSwitchValueASCII(
+        switches::kLoggingLevel);
+    int level = 0;
+    if (base::StringToInt(log_level, &level)) {
+      logging::SetMinLogLevel(level);
+    } else {
+      LOG(WARNING) << "Bad log level: " << log_level;
+    }
+  }
+}
+
 // Configures mongoose according to the given command line flags.
 // Returns true on success.
 bool SetMongooseOptions(struct mg_context* ctx,
                         const std::string& port,
                         const std::string& root) {
   if (!mg_set_option(ctx, "ports", port.c_str())) {
     std::cout << "ChromeDriver cannot bind to port ("
               << port.c_str() << ")" << std::endl;
     return false;
   }
@@ skipping 19 matching lines @@
 
 #if defined(OS_POSIX)
   signal(SIGPIPE, SIG_IGN);
 #endif
   srand((unsigned int)time(NULL));
 
   // Register Chrome's path provider so that the AutomationProxy will find our
   // built Chrome.
   chrome::RegisterPathProvider();
   TestTimeouts::Initialize();
+  InitChromeDriverLogging(*cmd_line);
 
   // Parse command line flags.
   std::string port = "9515";
   std::string root;
   std::string url_base;
-  bool verbose = false;
   if (cmd_line->HasSwitch("port"))
     port = cmd_line->GetSwitchValueASCII("port");
   // The 'root' flag allows the user to specify a location to serve files from.
   // If it is not given, a callback will be registered to forbid all file
   // requests.
   if (cmd_line->HasSwitch("root"))
     root = cmd_line->GetSwitchValueASCII("root");
   if (cmd_line->HasSwitch("url-base"))
     url_base = cmd_line->GetSwitchValueASCII("url-base");
-  // Whether or not to do verbose logging.
-  if (cmd_line->HasSwitch("verbose"))
-    verbose = true;
-
-  webdriver::InitWebDriverLogging(
-      verbose ? logging::LOG_INFO : logging::LOG_WARNING);
 
   webdriver::SessionManager* manager = webdriver::SessionManager::GetInstance();
   manager->set_port(port);
   manager->set_url_base(url_base);
 
   // Initialize SHTTPD context.
   // Listen on port 9515 or port specified on command line.
   // TODO(jmikhail) Maybe add port 9516 as a secure connection.
   ctx = mg_start();
   if (!SetMongooseOptions(ctx, port, root)) {
@@ skipping 19 matching lines @@
 
   // Run until we receive command to shutdown.
   shutdown_event.Wait();
 
   // We should not reach here since the service should never quit.
   // TODO(jmikhail): register a listener for SIGTERM and break the
   // message loop gracefully.
   mg_stop(ctx);
   return (EXIT_SUCCESS);
 }