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

Side by Side Diff: chrome/browser/net/chrome_net_log.cc

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix a merge conflict Created 5 years, 8 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/browser/net/chrome_net_log.h" 5 #include "chrome/browser/net/chrome_net_log.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/scoped_file.h" 10 #include "base/files/scoped_file.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/net/net_log_temp_file.h" 15 #include "chrome/browser/net/net_log_temp_file.h"
16 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" 16 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
19 #include "net/log/trace_net_log_observer.h" 19 #include "net/log/trace_net_log_observer.h"
20 #include "net/log/write_to_file_net_log_observer.h" 20 #include "net/log/write_to_file_net_log_observer.h"
21 21
22 namespace {
23
24 net::NetLogCaptureMode GetCaptureModeFromCommandLine(
25 const base::CommandLine& command_line) {
26 const net::NetLogCaptureMode kDefault = net::NetLogCaptureMode::Default();
27
28 // TODO(eroman): The NetLog "capture mode" used to be called the "log
29 // level". To preserve backwards compatibility the log level of old is
30 // converted into a capture mode.
31 if (!command_line.HasSwitch(switches::kNetLogLevel))
32 return kDefault;
33
34 std::string log_level_string =
35 command_line.GetSwitchValueASCII(switches::kNetLogLevel);
36
37 int level;
38 if (!base::StringToInt(log_level_string, &level))
39 return kDefault;
40
41 switch (level) {
42 case 0:
43 return net::NetLogCaptureMode::IncludeSocketBytes();
44 case 1:
45 return net::NetLogCaptureMode::IncludeCookiesAndCredentials();
46 case 2:
47 return net::NetLogCaptureMode::Default();
48 case 3:
49 return net::NetLogCaptureMode::None();
50 default:
51 LOG(ERROR) << "Unrecognized --" << switches::kNetLogLevel;
52 break;
53 }
54
55 return kDefault;
56 }
57
58 } // namespace
59
22 ChromeNetLog::ChromeNetLog() 60 ChromeNetLog::ChromeNetLog()
23 : net_log_temp_file_(new NetLogTempFile(this)) { 61 : net_log_temp_file_(new NetLogTempFile(this)) {
24 const base::CommandLine* command_line = 62 const base::CommandLine& command_line =
25 base::CommandLine::ForCurrentProcess(); 63 *base::CommandLine::ForCurrentProcess();
26 64
27 if (command_line->HasSwitch(switches::kLogNetLog)) { 65 if (command_line.HasSwitch(switches::kLogNetLog)) {
28 base::FilePath log_path = 66 base::FilePath log_path =
29 command_line->GetSwitchValuePath(switches::kLogNetLog); 67 command_line.GetSwitchValuePath(switches::kLogNetLog);
30 // Much like logging.h, bypass threading restrictions by using fopen 68 // Much like logging.h, bypass threading restrictions by using fopen
31 // directly. Have to write on a thread that's shutdown to handle events on 69 // directly. Have to write on a thread that's shutdown to handle events on
32 // shutdown properly, and posting events to another thread as they occur 70 // shutdown properly, and posting events to another thread as they occur
33 // would result in an unbounded buffer size, so not much can be gained by 71 // would result in an unbounded buffer size, so not much can be gained by
34 // doing this on another thread. It's only used when debugging Chrome, so 72 // doing this on another thread. It's only used when debugging Chrome, so
35 // performance is not a big concern. 73 // performance is not a big concern.
36 base::ScopedFILE file; 74 base::ScopedFILE file;
37 #if defined(OS_WIN) 75 #if defined(OS_WIN)
38 file.reset(_wfopen(log_path.value().c_str(), L"w")); 76 file.reset(_wfopen(log_path.value().c_str(), L"w"));
39 #elif defined(OS_POSIX) 77 #elif defined(OS_POSIX)
40 file.reset(fopen(log_path.value().c_str(), "w")); 78 file.reset(fopen(log_path.value().c_str(), "w"));
41 #endif 79 #endif
42 80
43 if (!file) { 81 if (!file) {
44 LOG(ERROR) << "Could not open file " << log_path.value() 82 LOG(ERROR) << "Could not open file " << log_path.value()
45 << " for net logging"; 83 << " for net logging";
46 } else { 84 } else {
47 scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants()); 85 scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
48 net_log_logger_.reset(new net::WriteToFileNetLogObserver()); 86 net_log_logger_.reset(new net::WriteToFileNetLogObserver());
49 if (command_line->HasSwitch(switches::kNetLogLevel)) { 87
50 std::string log_level_string = 88 net::NetLogCaptureMode capture_mode =
51 command_line->GetSwitchValueASCII(switches::kNetLogLevel); 89 GetCaptureModeFromCommandLine(command_line);
52 int command_line_log_level; 90 net_log_logger_->set_capture_mode(capture_mode);
53 if (base::StringToInt(log_level_string, &command_line_log_level) && 91
54 command_line_log_level >= LOG_ALL &&
55 command_line_log_level <= LOG_NONE) {
56 net_log_logger_->set_log_level(
57 static_cast<LogLevel>(command_line_log_level));
58 }
59 }
60 net_log_logger_->StartObserving(this, file.Pass(), constants.get(), 92 net_log_logger_->StartObserving(this, file.Pass(), constants.get(),
61 nullptr); 93 nullptr);
62 } 94 }
63 } 95 }
64 96
65 trace_net_log_observer_.reset(new net::TraceNetLogObserver()); 97 trace_net_log_observer_.reset(new net::TraceNetLogObserver());
66 trace_net_log_observer_->WatchForTraceStart(this); 98 trace_net_log_observer_->WatchForTraceStart(this);
67 } 99 }
68 100
69 ChromeNetLog::~ChromeNetLog() { 101 ChromeNetLog::~ChromeNetLog() {
70 net_log_temp_file_.reset(); 102 net_log_temp_file_.reset();
71 // Remove the observers we own before we're destroyed. 103 // Remove the observers we own before we're destroyed.
72 if (net_log_logger_) 104 if (net_log_logger_)
73 net_log_logger_->StopObserving(nullptr); 105 net_log_logger_->StopObserving(nullptr);
74 if (trace_net_log_observer_) 106 if (trace_net_log_observer_)
75 trace_net_log_observer_->StopWatchForTraceStart(); 107 trace_net_log_observer_->StopWatchForTraceStart();
76 } 108 }
77 109
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc ('k') | chrome/browser/net/net_log_temp_file.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698