summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-02 14:00:18 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-02 14:00:18 -0400
commit1804da89eea38615a4dd9532757b7ef7c35d2be6 (patch)
tree1766881d4ad077402eb7a6af834313a35207b918
parent1ed351e28f1134ba06fd9459927d0d146e204fbf (diff)
MAINT-5011: Abbreviate __FILE__ path in log_unhandled_exception_().
LLError::abbreviateFile() is specifically to avoid cluttering log output with the prefix of an absolute file path on the original build system, pointless for anyone trying to read the log.
-rw-r--r--indra/llcommon/llexception.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llexception.cpp b/indra/llcommon/llexception.cpp
index 25aa5847a2..b32ec2c9c9 100644
--- a/indra/llcommon/llexception.cpp
+++ b/indra/llcommon/llexception.cpp
@@ -20,6 +20,7 @@
#include <boost/exception/diagnostic_information.hpp>
// other Linden headers
#include "llerror.h"
+#include "llerrorcontrol.h"
namespace {
// used by crash_on_unhandled_exception_() and log_unhandled_exception_()
@@ -28,8 +29,8 @@ void log_unhandled_exception_(LLError::ELevel level,
const std::string& context)
{
// log same message but allow caller-specified severity level
- LL_VLOGS(level, "LLException")
- << file << "(" << line << "): Unhandled exception caught in " << pretty_function;
+ LL_VLOGS(level, "LLException") << LLError::abbreviateFile(file)
+ << "(" << line << "): Unhandled exception caught in " << pretty_function;
if (! context.empty())
{
LL_CONT << ": " << context;