diff options
| -rw-r--r-- | chromeos/network/managed_network_configuration_handler_impl.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/network_configuration_handler.cc | 10 | ||||
| -rw-r--r-- | chromeos/network/shill_property_util.cc | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc index 424e9d2..1cd4573 100644 --- a/chromeos/network/managed_network_configuration_handler_impl.cc +++ b/chromeos/network/managed_network_configuration_handler_impl.cc @@ -119,6 +119,7 @@ void ManagedNetworkConfigurationHandlerImpl::GetManagedProperties( InvokeErrorCallback(service_path, error_callback, kPoliciesNotInitialized); return; } + NET_LOG_USER("GetManagedProperties", service_path); network_configuration_handler_->GetShillProperties( service_path, base::Bind( @@ -197,6 +198,7 @@ void ManagedNetworkConfigurationHandlerImpl::GetProperties( const std::string& service_path, const network_handler::DictionaryResultCallback& callback, const network_handler::ErrorCallback& error_callback) { + NET_LOG_USER("GetProperties", service_path); network_configuration_handler_->GetShillProperties( service_path, base::Bind( diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc index 3aa9960..e6bc8db 100644 --- a/chromeos/network/network_configuration_handler.cc +++ b/chromeos/network/network_configuration_handler.cc @@ -69,7 +69,7 @@ void LogConfigProperties(const std::string& desc, std::string v = "******"; if (!shill_property_util::IsPassphraseKey(iter.key())) base::JSONWriter::Write(&iter.value(), &v); - NET_LOG(DEBUG) << desc << ": " << path + "." + iter.key() + "=" + v; + NET_LOG(USER) << desc << ": " << path + "." + iter.key() + "=" + v; } } @@ -202,7 +202,7 @@ void NetworkConfigurationHandler::GetShillProperties( const std::string& service_path, const network_handler::DictionaryResultCallback& callback, const network_handler::ErrorCallback& error_callback) { - NET_LOG(USER) << "GetProperties: " << service_path; + NET_LOG(USER) << "GetShillProperties: " << service_path; DBusThreadManager::Get()->GetShillServiceClient()->GetProperties( dbus::ObjectPath(service_path), base::Bind(&NetworkConfigurationHandler::GetPropertiesCallback, @@ -220,7 +220,7 @@ void NetworkConfigurationHandler::SetShillProperties( callback.Run(); return; } - NET_LOG(USER) << "SetProperties: " << service_path; + NET_LOG(USER) << "SetShillProperties: " << service_path; scoped_ptr<base::DictionaryValue> properties_to_set( shill_properties.DeepCopy()); @@ -264,7 +264,7 @@ void NetworkConfigurationHandler::ClearShillProperties( callback.Run(); return; } - NET_LOG(USER) << "ClearProperties: " << service_path; + NET_LOG(USER) << "ClearShillProperties: " << service_path; for (std::vector<std::string>::const_iterator iter = names.begin(); iter != names.end(); ++iter) { NET_LOG(DEBUG) << "ClearProperty: " << service_path << "." << *iter; @@ -300,7 +300,7 @@ void NetworkConfigurationHandler::CreateShillConfiguration( scoped_ptr<base::DictionaryValue> properties_to_set( shill_properties.DeepCopy()); - NET_LOG(USER) << "CreateConfiguration: " << type << ": " << network_id; + NET_LOG(USER) << "CreateShillConfiguration: " << type << ": " << network_id; std::string profile_path; properties_to_set->GetStringWithoutPathExpansion(shill::kProfileProperty, diff --git a/chromeos/network/shill_property_util.cc b/chromeos/network/shill_property_util.cc index 941630c..2e77fb7 100644 --- a/chromeos/network/shill_property_util.cc +++ b/chromeos/network/shill_property_util.cc @@ -78,7 +78,6 @@ std::string GetSSIDFromProperties(const base::DictionaryValue& properties, properties.GetStringWithoutPathExpansion(shill::kWifiHexSsid, &hex_ssid); if (hex_ssid.empty()) { - // Note: use VLOG here to avoid spamming the event log. if (verbose_logging) NET_LOG(DEBUG) << "GetSSIDFromProperties: No HexSSID set: " << name; return std::string(); @@ -88,10 +87,8 @@ std::string GetSSIDFromProperties(const base::DictionaryValue& properties, std::vector<uint8> raw_ssid_bytes; if (base::HexStringToBytes(hex_ssid, &raw_ssid_bytes)) { ssid = std::string(raw_ssid_bytes.begin(), raw_ssid_bytes.end()); - if (verbose_logging) { - NET_LOG(DEBUG) << "GetSSIDFromProperties: " << name - << " HexSsid=" << hex_ssid << " SSID=" << ssid; - } + VLOG(2) << "GetSSIDFromProperties: " << name << " HexSsid=" << hex_ssid + << " SSID=" << ssid; } else { NET_LOG(ERROR) << "GetSSIDFromProperties: " << name << " Error processing HexSsid: " << hex_ssid; |