summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 18:53:41 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 18:53:41 +0000
commit416a3c0d426b3ea4bfd9e31deb4857f16152336b (patch)
treed54f7abdfee245865d74ff4e7338d82f1093918c /remoting
parentd0b4373db41cdfcd4ad380ee5d5e23398b0373c8 (diff)
downloadchromium_src-416a3c0d426b3ea4bfd9e31deb4857f16152336b.zip
chromium_src-416a3c0d426b3ea4bfd9e31deb4857f16152336b.tar.gz
chromium_src-416a3c0d426b3ea4bfd9e31deb4857f16152336b.tar.bz2
Replace LOG(INFO) with VLOG(1) to avoid excessive logging.
BUG=80246 TEST=None Review URL: http://codereview.chromium.org/8043032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/chromoting_client.cc2
-rw-r--r--remoting/client/plugin/chromoting_instance.cc7
-rw-r--r--remoting/client/plugin/chromoting_scriptable_object.cc15
-rw-r--r--remoting/client/plugin/pepper_view.cc10
-rw-r--r--remoting/host/plugin/host_log_handler.cc4
-rw-r--r--remoting/host/plugin/host_script_object.cc2
-rw-r--r--remoting/protocol/jingle_session_manager.cc8
-rw-r--r--remoting/protocol/pepper_session_manager.cc6
8 files changed, 26 insertions, 28 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index ae581c8..71a611a 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -250,7 +250,7 @@ void ChromotingClient::BeginSessionResponse(
return;
}
- LOG(INFO) << "BeginSessionResponse received";
+ VLOG(1) << "BeginSessionResponse received";
// Inform the connection that the client has been authenticated. This will
// enable the communication channels.
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 7ab92c0..6281a24 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -149,7 +149,7 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
// occurs before the enterprise policy is read. We are guaranteed that the
// enterprise policy is pushed at least once, we we delay the connect call.
if (!initial_policy_received_) {
- LOG(INFO) << "Delaying connect until initial policy is read.";
+ VLOG(1) << "Delaying connect until initial policy is read.";
delayed_connect_.reset(
task_factory_.NewRunnableMethod(&ChromotingInstance::Connect, config));
return;
@@ -166,7 +166,8 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
view_proxy_, rectangle_decoder_.get(),
input_handler_.get(), NULL));
- LOG(INFO) << "Connecting.";
+ LOG(INFO) << "Connecting to " << config.host_jid
+ << ". Local jid: " << config.local_jid << ".";
// Setup the XMPP Proxy.
ChromotingScriptableObject* scriptable_object = GetScriptableObject();
@@ -179,7 +180,7 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
// Kick off the connection.
client_->Start(xmpp_proxy);
- LOG(INFO) << "Connection status: Initializing";
+ VLOG(1) << "Connection status: Initializing";
GetScriptableObject()->SetConnectionInfo(STATUS_INITIALIZING,
QUALITY_UNKNOWN);
}
diff --git a/remoting/client/plugin/chromoting_scriptable_object.cc b/remoting/client/plugin/chromoting_scriptable_object.cc
index 28c6303..28144c4 100644
--- a/remoting/client/plugin/chromoting_scriptable_object.cc
+++ b/remoting/client/plugin/chromoting_scriptable_object.cc
@@ -231,7 +231,7 @@ void ChromotingScriptableObject::SetConnectionInfo(ConnectionStatus status,
int status_index = property_names_[kStatusAttribute];
int quality_index = property_names_[kQualityAttribute];
- LOG(INFO) << "Connection status is updated: " << status;
+ VLOG(1) << "Connection status is updated: " << status;
if (properties_[status_index].attribute.AsInt() != status ||
properties_[quality_index].attribute.AsInt() != quality) {
@@ -269,7 +269,7 @@ void ChromotingScriptableObject::SetDesktopSize(int width, int height) {
SignalDesktopSizeChange();
}
- LOG(INFO) << "Update desktop size to: " << width << " x " << height;
+ VLOG(1) << "Update desktop size to: " << width << " x " << height;
}
void ChromotingScriptableObject::SignalLoginChallenge() {
@@ -398,8 +398,8 @@ Var ChromotingScriptableObject::DoConnect(const std::vector<Var>& args,
return Var();
}
- LOG(INFO) << "Connecting to host.";
- VLOG(1) << "client_jid: " << client_jid << ", host_jid: " << host_jid
+ VLOG(1) << "Connecting to host. "
+ << "client_jid: " << client_jid << ", host_jid: " << host_jid
<< ", access_code: " << access_code;
ClientConfig config;
config.local_jid = client_jid;
@@ -413,8 +413,7 @@ Var ChromotingScriptableObject::DoConnect(const std::vector<Var>& args,
Var ChromotingScriptableObject::DoDisconnect(const std::vector<Var>& args,
Var* exception) {
- LOG(INFO) << "Disconnecting from host.";
-
+ VLOG(1) << "Disconnecting from host.";
instance_->Disconnect();
return Var();
}
@@ -438,7 +437,7 @@ Var ChromotingScriptableObject::DoSubmitLogin(const std::vector<Var>& args,
}
std::string password = args[1].AsString();
- LOG(INFO) << "Submitting login info to host.";
+ VLOG(1) << "Submitting login info to host.";
instance_->SubmitLoginInfo(username, password);
return Var();
}
@@ -455,7 +454,7 @@ Var ChromotingScriptableObject::DoSetScaleToFit(const std::vector<Var>& args,
return Var();
}
- LOG(INFO) << "Setting scale-to-fit.";
+ VLOG(1) << "Setting scale-to-fit.";
instance_->SetScaleToFit(args[0].AsBool());
return Var();
}
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index 8d5525f..d05a22e 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -45,7 +45,7 @@ void PepperView::Paint() {
DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
if (is_static_fill_) {
- LOG(INFO) << "Static filling " << static_fill_color_;
+ VLOG(1) << "Static filling " << static_fill_color_;
pp::ImageData image(instance_, pp::ImageData::GetNativeImageDataFormat(),
pp::Size(graphics2d_.size().width(),
graphics2d_.size().height()),
@@ -258,8 +258,8 @@ bool PepperView::SetPluginSize(const gfx::Size& plugin_size) {
// Allocate the backing store to save the desktop image.
if ((backing_store_.get() == NULL) ||
(backing_store_->size() != pp_size)) {
- LOG(INFO) << "Allocate backing store: "
- << plugin_size.width() << " x " << plugin_size.height();
+ VLOG(1) << "Allocate backing store: "
+ << plugin_size.width() << " x " << plugin_size.height();
backing_store_.reset(
new pp::ImageData(instance_, pp::ImageData::GetNativeImageDataFormat(),
pp_size, false));
@@ -306,10 +306,8 @@ void PepperView::AllocateFrame(media::VideoFrame::Format format,
void PepperView::ReleaseFrame(media::VideoFrame* frame) {
DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
- if (frame) {
- LOG(WARNING) << "Frame released.";
+ if (frame)
frame->Release();
- }
}
void PepperView::OnPartialFrameOutput(media::VideoFrame* frame,
diff --git a/remoting/host/plugin/host_log_handler.cc b/remoting/host/plugin/host_log_handler.cc
index 2617c4b..d1b7761 100644
--- a/remoting/host/plugin/host_log_handler.cc
+++ b/remoting/host/plugin/host_log_handler.cc
@@ -52,7 +52,7 @@ void HostLogHandler::RegisterLoggingScriptObject(
HostNPScriptObject* script_object) {
base::AutoLock lock(g_logging_lock);
- LOG(INFO) << "Registering log handler scriptable object";
+ VLOG(1) << "Registering log handler scriptable object";
// Register this script object as the one that will handle all logging calls
// and display them to the user.
@@ -75,7 +75,7 @@ void HostLogHandler::UnregisterLoggingScriptObject(
g_has_logging_scriptable_object = false;
g_logging_scriptable_object = NULL;
- LOG(INFO) << "Unregistering log handler scriptable object";
+ VLOG(1) << "Unregistering log handler scriptable object";
}
// static
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 598b96e..76441fe 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -472,7 +472,7 @@ void HostNPScriptObject::FinishConnect(
register_request_.reset(register_request.release());
// Create the Host.
- LOG(INFO) << "Connecting with NAT state: " << nat_traversal_enabled_;
+ LOG(INFO) << "NAT state: " << nat_traversal_enabled_;
host_ = ChromotingHost::Create(
&host_context_, host_config_, desktop_environment_.get(),
access_verifier.release(), nat_traversal_enabled_);
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 4105e6f..fcb9005 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -266,14 +266,14 @@ void JingleSessionManager::OnJingleInfo(
for (size_t i = 0; i < stun_hosts.size(); ++i) {
stun_servers += stun_hosts[i].ToString() + "; ";
}
- LOG(INFO) << "Configuring with relay token: " << token
- << ", relays: " << JoinString(relay_hosts, ';')
- << ", stun: " << stun_servers;
+ VLOG(1) << "Configuring with relay token: " << token
+ << ", relays: " << JoinString(relay_hosts, ';')
+ << ", stun: " << stun_servers;
http_port_allocator_->SetRelayToken(token);
http_port_allocator_->SetStunHosts(stun_hosts);
http_port_allocator_->SetRelayHosts(relay_hosts);
} else {
- LOG(INFO) << "Jingle info found but no port allocator.";
+ LOG(WARNING) << "Jingle info found but no port allocator.";
}
listener_->OnSessionManagerInitialized();
diff --git a/remoting/protocol/pepper_session_manager.cc b/remoting/protocol/pepper_session_manager.cc
index 6eeed0c..e732511 100644
--- a/remoting/protocol/pepper_session_manager.cc
+++ b/remoting/protocol/pepper_session_manager.cc
@@ -66,9 +66,9 @@ void PepperSessionManager::OnJingleInfo(
transport_config_.stun_server = stun_hosts[0].ToString();
transport_config_.relay_server = relay_hosts[0];
transport_config_.relay_token = relay_token;
- LOG(INFO) << "STUN server: " << transport_config_.stun_server
- << " Relay server: " << transport_config_.relay_server
- << " Relay token: " << transport_config_.relay_token;
+ VLOG(1) << "STUN server: " << transport_config_.stun_server
+ << " Relay server: " << transport_config_.relay_server
+ << " Relay token: " << transport_config_.relay_token;
listener_->OnSessionManagerInitialized();
}