summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-25 19:30:52 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-25 19:30:52 +0000
commitb46d699461817984366d8a230a51ffb4d0afe8f1 (patch)
treead3a744785ed879bee20d5fcd0d866859af1c1d6 /net/tools/flip_server
parent87ecde9bc0017384d98b195dfd7e76dae63ac504 (diff)
downloadchromium_src-b46d699461817984366d8a230a51ffb4d0afe8f1.zip
chromium_src-b46d699461817984366d8a230a51ffb4d0afe8f1.tar.gz
chromium_src-b46d699461817984366d8a230a51ffb4d0afe8f1.tar.bz2
Revert 237095 "LOG(INFO) tidying in net/"
VLOG(0) isn't any better than LOG(INFO), other than sneaking past PRESUBMIT. > LOG(INFO) tidying in net/ > > Some deletions, some to VLOG. > > R=rsleevi@chromium.org > BUG=322805 > > Review URL: https://codereview.chromium.org/82913011 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/86203003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r--net/tools/flip_server/flip_in_mem_edsm_server.cc26
-rw-r--r--net/tools/flip_server/loadtime_measurement.h2
-rw-r--r--net/tools/flip_server/mem_cache.cc4
-rw-r--r--net/tools/flip_server/streamer_interface.cc4
4 files changed, 18 insertions, 18 deletions
diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc
index 3639807..79f3e5b 100644
--- a/net/tools/flip_server/flip_in_mem_edsm_server.cc
+++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc
@@ -275,26 +275,26 @@ int main (int argc, char**argv)
settings.lock_log = logging::DONT_LOCK_LOG_FILE;
logging::InitLogging(settings);
- VLOG(0) << "Flip SPDY proxy started with configuration:";
- VLOG(0) << "Logging destination : " << g_proxy_config.log_destination_;
- VLOG(0) << "Log file : " << g_proxy_config.log_filename_;
- VLOG(0) << "Forward IP Header : "
+ LOG(INFO) << "Flip SPDY proxy started with configuration:";
+ LOG(INFO) << "Logging destination : " << g_proxy_config.log_destination_;
+ LOG(INFO) << "Log file : " << g_proxy_config.log_filename_;
+ LOG(INFO) << "Forward IP Header : "
<< (net::SpdySM::forward_ip_header().length() ?
net::SpdySM::forward_ip_header() : "<disabled>");
- VLOG(0) << "Wait for interfaces : " << (wait_for_iface?"true":"false");
- VLOG(0) << "Accept backlog size : " << FLAGS_accept_backlog_size;
- VLOG(0) << "Accepts per wake : " << FLAGS_accepts_per_wake;
- VLOG(0) << "Disable nagle : "
+ LOG(INFO) << "Wait for interfaces : " << (wait_for_iface?"true":"false");
+ LOG(INFO) << "Accept backlog size : " << FLAGS_accept_backlog_size;
+ LOG(INFO) << "Accepts per wake : " << FLAGS_accepts_per_wake;
+ LOG(INFO) << "Disable nagle : "
<< (FLAGS_disable_nagle?"true":"false");
- VLOG(0) << "Reuseport : "
+ LOG(INFO) << "Reuseport : "
<< (FLAGS_reuseport?"true":"false");
- VLOG(0) << "Force SPDY : "
+ LOG(INFO) << "Force SPDY : "
<< (FLAGS_force_spdy?"true":"false");
- VLOG(0) << "SSL session expiry : "
+ LOG(INFO) << "SSL session expiry : "
<< g_proxy_config.ssl_session_expiry_;
- VLOG(0) << "SSL disable compression : "
+ LOG(INFO) << "SSL disable compression : "
<< g_proxy_config.ssl_disable_compression_;
- VLOG(0) << "Connection idle timeout : "
+ LOG(INFO) << "Connection idle timeout : "
<< g_proxy_config.idle_socket_timeout_s_;
// Proxy Acceptors
diff --git a/net/tools/flip_server/loadtime_measurement.h b/net/tools/flip_server/loadtime_measurement.h
index 6cf9e50..b46217e 100644
--- a/net/tools/flip_server/loadtime_measurement.h
+++ b/net/tools/flip_server/loadtime_measurement.h
@@ -61,7 +61,7 @@ class LoadtimeMeasurement {
if (action.find("test_complete") == 0) {
for (std::map<std::string, int>::const_iterator it = loadtimes_.begin();
it != loadtimes_.end(); ++it) {
- VLOG(0) << it->first << " " << it->second;
+ LOG(INFO) << it->first << " " << it->second;
}
loadtimes_.clear();
output.append("OK");
diff --git a/net/tools/flip_server/mem_cache.cc b/net/tools/flip_server/mem_cache.cc
index d87c086..42d9343 100644
--- a/net/tools/flip_server/mem_cache.cc
+++ b/net/tools/flip_server/mem_cache.cc
@@ -160,7 +160,7 @@ void MemoryCache::ReadAndStoreFileContents(const char* filename) {
LOG(ERROR) << "Unable to make forward progress, or error"
" framing file: " << filename;
if (framer.Error()) {
- VLOG(0) << "********************************************ERROR!";
+ LOG(INFO) << "********************************************ERROR!";
return;
}
return;
@@ -196,7 +196,7 @@ void MemoryCache::ReadAndStoreFileContents(const char* filename) {
DCHECK_EQ(std::string(filename).substr(0, cwd_.size()), cwd_);
DCHECK_EQ(filename[cwd_.size()], '/');
std::string filename_stripped = std::string(filename).substr(cwd_.size() + 1);
- VLOG(0) << "Adding file (" << visitor.body.length() << " bytes): "
+ LOG(INFO) << "Adding file (" << visitor.body.length() << " bytes): "
<< filename_stripped;
size_t slash_pos = filename_stripped.find('/');
if (slash_pos == std::string::npos) {
diff --git a/net/tools/flip_server/streamer_interface.cc b/net/tools/flip_server/streamer_interface.cc
index ce8a3d7..8c2e0e7 100644
--- a/net/tools/flip_server/streamer_interface.cc
+++ b/net/tools/flip_server/streamer_interface.cc
@@ -173,11 +173,11 @@ void StreamerSM::ProcessHeaders(const BalsaHeaders& headers) {
BalsaHeaders mod_headers;
mod_headers.CopyFrom(headers);
if (forward_ip_header_.length()) {
- VLOG(0) << "Adding forward header: " << forward_ip_header_;
+ LOG(INFO) << "Adding forward header: " << forward_ip_header_;
mod_headers.ReplaceOrAppendHeader(forward_ip_header_,
connection_->client_ip());
} else {
- VLOG(0) << "NOT adding forward header.";
+ LOG(INFO) << "NOT adding forward header.";
}
SimpleBuffer sb;
char* buffer;