diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-12-14 11:24:39 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-12-14 17:44:08 -0500 |
| commit | 5770fdcdf73d9576d6e8728ac0bbf12b7fafbbd4 (patch) | |
| tree | 6470dd55f4a05c2f7601a82621a328c09e9b4e24 | |
| parent | 7468a98c8333b4eb5ede8d9fbe23ab2da27a21c4 (diff) | |
| download | mongo-5770fdcdf73d9576d6e8728ac0bbf12b7fafbbd4.tar.gz | |
SERVER-21050 Make the 'causedBy' reports more descriptive
| -rw-r--r-- | src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/util/assert_util.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp b/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp index cd27e73ecd3..1c1e3f062d9 100644 --- a/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp +++ b/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp @@ -1298,7 +1298,7 @@ Status CatalogManagerLegacy::_checkConfigServersConsistent(const unsigned tries) if (up == 0) { return {networkError ? ErrorCodes::HostUnreachable : ErrorCodes::UnknownError, - str::stream() << "no config servers successfully contacted" << causedBy(&errMsg)}; + str::stream() << "no config servers successfully contacted" << causedBy(errMsg)}; } else if (up == 1) { warning() << "only 1 config server reachable, continuing"; return Status::OK(); diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp index 05b5a433956..0ff252259f9 100644 --- a/src/mongo/util/assert_util.cpp +++ b/src/mongo/util/assert_util.cpp @@ -249,12 +249,8 @@ std::string causedBy(const std::string& e) { return causedBy(e.c_str()); } -std::string causedBy(const std::string* e) { - return (e && *e != "") ? causedBy(*e) : ""; -} - std::string causedBy(const Status& e) { - return causedBy(e.reason()); + return causedBy(e.toString()); } string errnoWithPrefix(StringData prefix) { |