commit fad4a0b7e55dd82d3815ee96862b6e546727eb6e
author Ben Chan <benchan@chromium.org> Wed Apr 18 15:49:59 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Apr 20 11:09:45 2012 -0700
tree 6d2622f8a07981d78eeaa89e8abed64ec063df0d
parent 3022be5da0e7e158c7f8fc4e3f5d005eb5dde7e7

shill: Replace VLOG with SLOG.

This CL replaces all uses of VLOG(level) with SLOG(scope, level) with
the same verbose level and an appropriate scope for each affected
logging statement.

BUG=chromium-os:29641
TEST=Build and run unit tests. Test scope logging with ff_debug.

Change-Id: Ifdcf1faa2a309bcbd9ee369a66179ce9c7f1ad19
Reviewed-on: https://gerrit.chromium.org/gerrit/20629
Commit-Ready: Ben Chan <benchan@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

dhcp_config.cc

diff --git a/dhcp_config.cc b/dhcp_config.cc
index 4053508..ee9ec53 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -18,6 +18,7 @@
 #include "shill/glib.h"
 #include "shill/ip_address.h"
 #include "shill/proxy_factory.h"
+#include "shill/scope_logger.h"
 
 using std::string;
 using std::vector;
@@ -65,11 +66,11 @@
       glib_(glib) {
   mutable_store()->RegisterConstString(flimflam::kAddressProperty,
                                        &(properties().address));
-  VLOG(2) << __func__ << ": " << device_name;
+  SLOG(DHCP, 2) << __func__ << ": " << device_name;
 }
 
 DHCPConfig::~DHCPConfig() {
-  VLOG(2) << __func__ << ": " << device_name();
+  SLOG(DHCP, 2) << __func__ << ": " << device_name();
 
   // Don't leave behind dhcpcd running.
   Stop();
@@ -79,7 +80,7 @@
 }
 
 bool DHCPConfig::RequestIP() {
-  VLOG(2) << __func__ << ": " << device_name();
+  SLOG(DHCP, 2) << __func__ << ": " << device_name();
   if (!pid_) {
     return Start();
   }
@@ -91,7 +92,7 @@
 }
 
 bool DHCPConfig::RenewIP() {
-  VLOG(2) << __func__ << ": " << device_name();
+  SLOG(DHCP, 2) << __func__ << ": " << device_name();
   if (!pid_) {
     return false;
   }
@@ -100,7 +101,7 @@
 }
 
 bool DHCPConfig::ReleaseIP() {
-  VLOG(2) << __func__ << ": " << device_name();
+  SLOG(DHCP, 2) << __func__ << ": " << device_name();
   if (!pid_) {
     return true;
   }
@@ -113,7 +114,7 @@
 
 void DHCPConfig::InitProxy(const string &service) {
   if (!proxy_.get()) {
-    VLOG(2) << "Init DHCP Proxy: " << device_name() << " at " << service;
+    SLOG(DHCP, 2) << "Init DHCP Proxy: " << device_name() << " at " << service;
     proxy_.reset(proxy_factory_->CreateDHCPProxy(service));
   }
 }
@@ -139,7 +140,7 @@
 }
 
 bool DHCPConfig::Start() {
-  VLOG(2) << __func__ << ": " << device_name();
+  SLOG(DHCP, 2) << __func__ << ": " << device_name();
 
   vector<char *> args;
   args.push_back(const_cast<char *>(kDHCPCDPath));
@@ -173,7 +174,7 @@
 
 void DHCPConfig::Stop() {
   if (pid_) {
-    VLOG(2) << "Terminating " << pid_;
+    SLOG(DHCP, 2) << "Terminating " << pid_;
     if (kill(pid_, SIGTERM) < 0) {
       PLOG(ERROR);
       return;
@@ -220,14 +221,14 @@
 
 bool DHCPConfig::ParseConfiguration(const Configuration& configuration,
                                     IPConfig::Properties *properties) {
-  VLOG(2) << __func__;
+  SLOG(DHCP, 2) << __func__;
   properties->method = flimflam::kTypeDHCP;
   properties->address_family = IPAddress::kFamilyIPv4;
   for (Configuration::const_iterator it = configuration.begin();
        it != configuration.end(); ++it) {
     const string &key = it->first;
     const DBus::Variant &value = it->second;
-    VLOG(2) << "Processing key: " << key;
+    SLOG(DHCP, 2) << "Processing key: " << key;
     if (key == kConfigurationKeyIPAddress) {
       properties->address = GetIPv4AddressString(value.reader().get_uint32());
       if (properties->address.empty()) {
@@ -271,14 +272,14 @@
         properties->mtu = mtu;
       }
     } else {
-      VLOG(2) << "Key ignored.";
+      SLOG(DHCP, 2) << "Key ignored.";
     }
   }
   return true;
 }
 
 void DHCPConfig::ChildWatchCallback(GPid pid, gint status, gpointer data) {
-  VLOG(2) << "pid " << pid << " exit status " << status;
+  SLOG(DHCP, 2) << "pid " << pid << " exit status " << status;
   DHCPConfig *config = reinterpret_cast<DHCPConfig *>(data);
   config->child_watch_tag_ = 0;
   CHECK_EQ(pid, config->pid_);