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>
diff --git a/dbus_adaptor.cc b/dbus_adaptor.cc
index 2514f9e..81a2102 100644
--- a/dbus_adaptor.cc
+++ b/dbus_adaptor.cc
@@ -16,6 +16,7 @@
#include "shill/error.h"
#include "shill/key_value_store.h"
#include "shill/property_store.h"
+#include "shill/scope_logger.h"
using base::Bind;
using base::Owned;
@@ -38,7 +39,7 @@
DBusAdaptor::DBusAdaptor(DBus::Connection* conn, const string &object_path)
: DBus::ObjectAdaptor(*conn, object_path) {
- VLOG(2) << "DBusAdaptor: " << object_path;
+ SLOG(DBus, 2) << "DBusAdaptor: " << object_path;
}
DBusAdaptor::~DBusAdaptor() {}
@@ -67,7 +68,7 @@
value.operator map<string, string>(),
&e);
else if (DBusAdaptor::IsStringmaps(value.signature())) {
- VLOG(1) << " can't yet handle setting type " << value.signature();
+ SLOG(DBus, 1) << " can't yet handle setting type " << value.signature();
e.Populate(Error::kInternalError);
} else if (DBusAdaptor::IsStrings(value.signature()))
store->SetStringsProperty(name, value.operator vector<string>(), &e);
@@ -76,7 +77,7 @@
else if (DBusAdaptor::IsUint32(value.signature()))
store->SetUint32Property(name, value.reader().get_uint32(), &e);
else if (DBusAdaptor::IsKeyValueStore(value.signature())) {
- VLOG(1) << " can't yet handle setting type " << value.signature();
+ SLOG(DBus, 1) << " can't yet handle setting type " << value.signature();
e.Populate(Error::kInternalError);
} else {
NOTREACHED() << " unknown type: " << value.signature();