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

Side by Side Diff: chrome/test/chromedriver/logging.cc

Issue 2644033004: [chromedriver] Prevent GetLog from returning more than 100,000 at a time. (Closed)
Patch Set: Created 3 years, 11 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
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/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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 session_log->AddEntry(level, message); 123 session_log->AddEntry(level, message);
124 124
125 return true; 125 return true;
126 } 126 }
127 127
128 } // namespace 128 } // namespace
129 129
130 const char WebDriverLog::kBrowserType[] = "browser"; 130 const char WebDriverLog::kBrowserType[] = "browser";
131 const char WebDriverLog::kDriverType[] = "driver"; 131 const char WebDriverLog::kDriverType[] = "driver";
132 const char WebDriverLog::kPerformanceType[] = "performance"; 132 const char WebDriverLog::kPerformanceType[] = "performance";
133 const size_t WebDriverLog::kMaxReturnedEntries = 100000;
133 134
134 bool WebDriverLog::NameToLevel(const std::string& name, Log::Level* out_level) { 135 bool WebDriverLog::NameToLevel(const std::string& name, Log::Level* out_level) {
135 for (size_t i = 0; i < arraysize(kNameToLevel); ++i) { 136 for (size_t i = 0; i < arraysize(kNameToLevel); ++i) {
136 if (name == kNameToLevel[i].name) { 137 if (name == kNameToLevel[i].name) {
137 *out_level = kNameToLevel[i].level; 138 *out_level = kNameToLevel[i].level;
138 return true; 139 return true;
139 } 140 }
140 } 141 }
141 return false; 142 return false;
142 } 143 }
143 144
144 WebDriverLog::WebDriverLog(const std::string& type, Log::Level min_level) 145 WebDriverLog::WebDriverLog(const std::string& type, Log::Level min_level)
145 : type_(type), min_level_(min_level), entries_(new base::ListValue()) { 146 : type_(type), min_level_(min_level), entries_(new base::ListValue()) {
146 } 147 }
147 148
148 WebDriverLog::~WebDriverLog() { 149 WebDriverLog::~WebDriverLog() {
149 VLOG(1) << "Log type '" << type_ << "' lost " 150 VLOG(1) << "Log type '" << type_ << "' lost "
150 << entries_->GetSize() << " entries on destruction"; 151 << entries_->GetSize() << " entries on destruction";
151 } 152 }
152 153
153 std::unique_ptr<base::ListValue> WebDriverLog::GetAndClearEntries() { 154 std::unique_ptr<base::ListValue> WebDriverLog::GetAndClearEntries() {
154 std::unique_ptr<base::ListValue> ret(entries_.release()); 155 std::unique_ptr<base::ListValue> ret(new base::ListValue());
155 entries_.reset(new base::ListValue()); 156 if (entries_->GetSize() <= WebDriverLog::kMaxReturnedEntries) {
157 std::swap(entries_, ret);
158 } else {
159 // net::HttpServer has a maximum buffer size of 100MB. If there are too many
160 // log entries, we'll fail to send them all back in one go. So we only
161 // return |kMaxReturnedEntries| entries at a time.
162 // TODO(crbug.com/681892): Add streaming support to net::HttpServer, so that
163 // we don't have to worry about its buffer size.
164 for (size_t i = 0; i < kMaxReturnedEntries; i++) {
stgao 2017/01/20 03:40:12 Maybe leave a TODO to revisit whether it is possib
samuong 2017/01/23 18:09:24 Done.
165 std::unique_ptr<base::Value> entry;
166 if (!entries_->Remove(0, &entry))
klm 2017/01/19 20:47:30 I wonder if there is a race between this and the e
samuong 2017/01/19 21:15:36 I don't think there is a race condition - the WebD
stgao 2017/01/20 03:40:12 IIRC, each session has its own thread.
samuong 2017/01/23 18:09:24 Done.
167 break;
168 ret->Append(std::move(entry));
169 }
170 }
156 return ret; 171 return ret;
157 } 172 }
158 173
159 std::string WebDriverLog::GetFirstErrorMessage() const { 174 std::string WebDriverLog::GetFirstErrorMessage() const {
160 for (base::ListValue::iterator it = entries_->begin(); 175 for (base::ListValue::iterator it = entries_->begin();
161 it != entries_->end(); 176 it != entries_->end();
162 ++it) { 177 ++it) {
163 base::DictionaryValue* log_entry = NULL; 178 base::DictionaryValue* log_entry = NULL;
164 (*it)->GetAsDictionary(&log_entry); 179 (*it)->GetAsDictionary(&log_entry);
165 if (log_entry != NULL) { 180 if (log_entry != NULL) {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 logs.push_back(browser_log); 307 logs.push_back(browser_log);
293 // If the level is OFF, don't even bother listening for DevTools events. 308 // If the level is OFF, don't even bother listening for DevTools events.
294 if (browser_log_level != Log::kOff) 309 if (browser_log_level != Log::kOff)
295 devtools_listeners.push_back(new ConsoleLogger(browser_log)); 310 devtools_listeners.push_back(new ConsoleLogger(browser_log));
296 311
297 out_logs->swap(logs); 312 out_logs->swap(logs);
298 out_devtools_listeners->swap(devtools_listeners); 313 out_devtools_listeners->swap(devtools_listeners);
299 out_command_listeners->swap(command_listeners); 314 out_command_listeners->swap(command_listeners);
300 return Status(kOk); 315 return Status(kOk);
301 } 316 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698