commit 06175d70a09135fa0bac045807bca87c3c142289
author mukesh agrawal <quiche@chromium.org> Mon Apr 23 16:46:01 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Apr 27 16:25:53 2012 -0700
tree 1503deee5735ab728d24d1ed1dd6c64440cbc144
parent 4357f4ea204e5d3e7632d67f26531e106dd211e2

shill: improve logging

- add logging of D-Bus interactions
- convert some error->Populate calls to Error::PopulateAndLog
- slipped in: some whitespace and spelling fixes

BUG=chromium-os:29882
TEST=unit tests

Change-Id: I29cd455cb74cbf467e978a6dc7db3cadac248e43
Reviewed-on: https://gerrit.chromium.org/gerrit/21383
Commit-Ready: mukesh agrawal <quiche@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

mm1_modem_simple_proxy.cc

diff --git a/mm1_modem_simple_proxy.cc b/mm1_modem_simple_proxy.cc
index de3adc1..e17c156 100644
--- a/mm1_modem_simple_proxy.cc
+++ b/mm1_modem_simple_proxy.cc
@@ -6,7 +6,8 @@
 
 #include <base/logging.h>
 
-#include "cellular_error.h"
+#include "shill/cellular_error.h"
+#include "shill/scope_logger.h"
 
 using std::string;
 
@@ -27,6 +28,7 @@
     int timeout) {
   scoped_ptr<DBusPathCallback> cb(new DBusPathCallback(callback));
   try {
+    SLOG(DBus, 2) << __func__;
     proxy_.Connect(properties, cb.get(), timeout);
     cb.release();
   } catch (DBus::Error e) {
@@ -41,6 +43,7 @@
                                   int timeout) {
   scoped_ptr<ResultCallback> cb(new ResultCallback(callback));
   try {
+    SLOG(DBus, 2) << __func__;
     proxy_.Disconnect(bearer, cb.get(), timeout);
     cb.release();
   } catch (DBus::Error e) {
@@ -53,7 +56,8 @@
                                  const DBusPropertyMapCallback &callback,
                                  int timeout) {
   scoped_ptr<DBusPropertyMapCallback> cb(new DBusPropertyMapCallback(callback));
-  try  {
+  try {
+    SLOG(DBus, 2) << __func__;
     proxy_.GetStatus(cb.get(), timeout);
     cb.release();
   } catch (DBus::Error e) {
@@ -76,6 +80,7 @@
 void ModemSimpleProxy::Proxy::ConnectCallback(const ::DBus::Path &bearer,
                                               const ::DBus::Error &dberror,
                                               void *data) {
+  SLOG(DBus, 2) << __func__;
   scoped_ptr<DBusPathCallback> callback(
       reinterpret_cast<DBusPathCallback *>(data));
   Error error;
@@ -85,6 +90,7 @@
 
 void ModemSimpleProxy::Proxy::DisconnectCallback(const ::DBus::Error &dberror,
                                                  void *data) {
+  SLOG(DBus, 2) << __func__;
   scoped_ptr<ResultCallback> callback(reinterpret_cast<ResultCallback *>(data));
   Error error;
   CellularError::FromDBusError(dberror, &error);
@@ -95,6 +101,7 @@
     const DBusPropertiesMap &properties,
     const ::DBus::Error &dberror,
     void *data) {
+  SLOG(DBus, 2) << __func__;
   scoped_ptr<DBusPropertyMapCallback> callback(
       reinterpret_cast<DBusPropertyMapCallback *>(data));
   Error error;