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

Side by Side Diff: chrome/test/webdriver/webdriver_logging.cc

Issue 10411031: Fixing loglevel in chrome driver to accept string rather than an integer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added OFF driver logging level. Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/webdriver/webdriver_logging.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/webdriver/webdriver_logging.h" 5 #include "chrome/test/webdriver/webdriver_logging.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/string_util.h"
13 #include "base/stringprintf.h" 14 #include "base/stringprintf.h"
14 #include "base/time.h" 15 #include "base/time.h"
15 #include "build/build_config.h" 16 #include "build/build_config.h"
16 17
17 using base::DictionaryValue; 18 using base::DictionaryValue;
18 using base::ListValue; 19 using base::ListValue;
19 using base::Value; 20 using base::Value;
20 21
21 namespace webdriver { 22 namespace webdriver {
22 23
23 FileLog* FileLog::singleton_ = NULL; 24 FileLog* FileLog::singleton_ = NULL;
24 25
25 double start_time = 0; 26 double start_time = 0;
26 27
28 LogLevel LogLevelFromString(const std::string& name) {
29 // Default logging level is INFO.
30 LogLevel level = kInfoLogLevel;
31 const std::string upper_case_name = StringToUpperASCII(name);
32 if (upper_case_name == "OFF") {
33 level = kOffLogLevel;
34 } else if (upper_case_name == "SEVERE") {
35 level = kSevereLogLevel;
36 } else if (upper_case_name == "WARNING") {
37 level = kWarningLogLevel;
38 } else if (upper_case_name == "INFO" || upper_case_name == "CONFIG") {
39
40 } else if (upper_case_name == "FINE") {
41 level = kFineLogLevel;
42 } else if (upper_case_name == "FINER") {
43 level = kFinerLogLevel;
44 } else if (upper_case_name == "ALL" || upper_case_name == "FINEST") {
45 level = kAllLogLevel;
46 }
47 return level;
48 }
49
27 // static 50 // static
28 bool LogType::FromString(const std::string& name, LogType* log_type) { 51 bool LogType::FromString(const std::string& name, LogType* log_type) {
29 if (name == "driver") { 52 if (name == "driver") {
30 *log_type = LogType(kDriver); 53 *log_type = LogType(kDriver);
31 } else { 54 } else {
32 return false; 55 return false;
33 } 56 }
34 return true; 57 return true;
35 } 58 }
36 59
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 115
93 FileLog::~FileLog() { } 116 FileLog::~FileLog() { }
94 117
95 void FileLog::Log(LogLevel level, const base::Time& time, 118 void FileLog::Log(LogLevel level, const base::Time& time,
96 const std::string& message) { 119 const std::string& message) {
97 if (!file_.get() || level < min_log_level_) 120 if (!file_.get() || level < min_log_level_)
98 return; 121 return;
99 122
100 const char* level_name = "UNKNOWN"; 123 const char* level_name = "UNKNOWN";
101 switch (level) { 124 switch (level) {
125 case kOffLogLevel:
126 level_name = "OFF";
127 break;
102 case kSevereLogLevel: 128 case kSevereLogLevel:
103 level_name = "SEVERE"; 129 level_name = "SEVERE";
104 break; 130 break;
105 case kWarningLogLevel: 131 case kWarningLogLevel:
106 level_name = "WARNING"; 132 level_name = "WARNING";
107 break; 133 break;
108 case kInfoLogLevel: 134 case kInfoLogLevel:
109 level_name = "INFO"; 135 level_name = "INFO";
110 break; 136 break;
111 case kFineLogLevel: 137 case kFineLogLevel:
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 log = FileLog::CreateFileLog(FILE_PATH_LITERAL("chromedriver.log"), 247 log = FileLog::CreateFileLog(FILE_PATH_LITERAL("chromedriver.log"),
222 min_log_level); 248 min_log_level);
223 } else { 249 } else {
224 log = new FileLog(log_path, min_log_level); 250 log = new FileLog(log_path, min_log_level);
225 } 251 }
226 FileLog::SetGlobalLog(log); 252 FileLog::SetGlobalLog(log);
227 return log->IsOpen(); 253 return log->IsOpen();
228 } 254 }
229 255
230 } // namespace webdriver 256 } // namespace webdriver
OLDNEW
« no previous file with comments | « chrome/test/webdriver/webdriver_logging.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698