summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_handler_callbacks.cc
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 21:56:08 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 21:56:08 +0000
commit5092ea8719a8f0d64ca808e3ccbbf1b310987f92 (patch)
treeef55ba03c4710e6890ed57f351c3b87793ab722a /chromeos/network/network_handler_callbacks.cc
parent77d6e643095351e50717b44d9c69823431404a3d (diff)
downloadchromium_src-5092ea8719a8f0d64ca808e3ccbbf1b310987f92.zip
chromium_src-5092ea8719a8f0d64ca808e3ccbbf1b310987f92.tar.gz
chromium_src-5092ea8719a8f0d64ca808e3ccbbf1b310987f92.tar.bz2
Re-factor network_event_log
BUG=239652 For webui: TBR=gauravsh@chromium.org, pneubeck@chromium.org Review URL: https://codereview.chromium.org/14876021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_handler_callbacks.cc')
-rw-r--r--chromeos/network/network_handler_callbacks.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/chromeos/network/network_handler_callbacks.cc b/chromeos/network/network_handler_callbacks.cc
index f10a12f..597b8bd 100644
--- a/chromeos/network/network_handler_callbacks.cc
+++ b/chromeos/network/network_handler_callbacks.cc
@@ -11,8 +11,6 @@
namespace chromeos {
namespace network_handler {
-const char kLogModule[] = "ShillError";
-
// These are names of fields in the error data dictionary for ErrorCallback.
const char kErrorName[] = "errorName";
const char kErrorMessage[] = "errorMessage";
@@ -29,17 +27,16 @@ base::DictionaryValue* CreateErrorData(const std::string& service_path,
return error_data;
}
-void ShillErrorCallbackFunction(const std::string& module,
- const std::string& path,
+void ShillErrorCallbackFunction(const std::string& path,
const ErrorCallback& error_callback,
const std::string& error_name,
const std::string& error_message) {
- std::string error = "Shill Error in " + module;
+ std::string error = "Shill Error";
if (!path.empty())
error += " For " + path;
- error += ": " + error_name + " : " + error_message;
- LOG(ERROR) << error;
- network_event_log::AddEntry(kLogModule, module, error);
+ error += ": " + error_name;
+ NET_LOG_ERROR(error, error_message);
+ LOG(ERROR) << error << " : " << error_message;
if (error_callback.is_null())
return;
scoped_ptr<base::DictionaryValue> error_data(