libchromeos: Add error location informaion to chromeos::Error
The error information logged always appears to come from error.cc
file in libchormeos since that's where LOG(ERROR) statement is.
Added the ability to pass in the actual source of the error by
using tracked_objects::Location parameter and "FROM_HERE" macros
used in base::TaskRunner-based classes.
While all the system log messages looked like this:
[ERROR:error.cc(15)] Domain=peerd, Code=service.info, Message=Invalid service key.
Now they appear as this:
ERROR:service.cc(155)] IsValidServiceInfo(...): Domain=peerd, Code=service.info, Message=Invalid service key.
We report the actual source file and line number where the error is
coming from, as well as the function name.
BUG=None
TEST=FEATURES=test emerge-link libchromeos buffet lorgnette peerd privetd
Change-Id: I647997c24d61a03f3b481e4c9ca336c90e99e9a3
Reviewed-on: https://chromium-review.googlesource.com/229071
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/buffet/commands/prop_constraints.cc b/buffet/commands/prop_constraints.cc
index c9008d2..d44700d 100644
--- a/buffet/commands/prop_constraints.cc
+++ b/buffet/commands/prop_constraints.cc
@@ -15,7 +15,7 @@
const std::string& val,
const std::string& limit) {
chromeos::Error::AddToPrintf(
- error, errors::commands::kDomain,
+ error, FROM_HERE, errors::commands::kDomain,
errors::commands::kOutOfRange,
"Value %s is out of range. It must not be less than %s",
val.c_str(), limit.c_str());
@@ -26,7 +26,7 @@
const std::string& val,
const std::string& limit) {
chromeos::Error::AddToPrintf(
- error, errors::commands::kDomain,
+ error, FROM_HERE, errors::commands::kDomain,
errors::commands::kOutOfRange,
"Value %s is out of range. It must not be greater than %s",
val.c_str(), limit.c_str());
@@ -36,7 +36,7 @@
bool Constraint::ReportErrorNotOneOf(chromeos::ErrorPtr* error,
const std::string& val,
const std::vector<std::string>& values) {
- chromeos::Error::AddToPrintf(error, errors::commands::kDomain,
+ chromeos::Error::AddToPrintf(error, FROM_HERE, errors::commands::kDomain,
errors::commands::kOutOfRange,
"Value %s is invalid. Expected one of [%s]",
val.c_str(),
@@ -84,11 +84,11 @@
int length = static_cast<int>(str.size());
if (length < limit_.value) {
if (limit_.value == 1) {
- chromeos::Error::AddTo(error, errors::commands::kDomain,
+ chromeos::Error::AddTo(error, FROM_HERE, errors::commands::kDomain,
errors::commands::kOutOfRange,
"String must not be empty");
} else {
- chromeos::Error::AddToPrintf(error, errors::commands::kDomain,
+ chromeos::Error::AddToPrintf(error, FROM_HERE, errors::commands::kDomain,
errors::commands::kOutOfRange,
"String must be at least %d characters long,"
" actual length of string '%s' is %d",
@@ -116,7 +116,7 @@
const std::string& str = value.GetString()->GetValue();
int length = static_cast<int>(str.size());
if (length > limit_.value) {
- chromeos::Error::AddToPrintf(error, errors::commands::kDomain,
+ chromeos::Error::AddToPrintf(error, FROM_HERE, errors::commands::kDomain,
errors::commands::kOutOfRange,
"String must be no more than %d character(s) "
"long, actual length of string '%s' is %d",