From 35ab71d8ea85ff43f1940bc582bb5bbb8f52d6df Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Thu, 20 Mar 2014 12:04:39 -0700
Subject: [PATCH] Returned Secondlife.log to main directory due to unforeseen
LLErrorThread complexities.
---
indra/llcrashlogger/llcrashlogger.cpp | 8 +-------
indra/newview/llappviewer.cpp | 11 -----------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index a48c475e855..df6ed5a8f09 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -218,7 +218,7 @@ void LLCrashLogger::gatherFiles()
{
// Figure out the filename of the second life log
LLCurl::setCAFile(gDirUtilp->getCAFile());
- mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"SecondLife.log");
+ mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.old"); //We want the log of the last run now.
mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
}
@@ -477,12 +477,6 @@ bool LLCrashLogger::sendCrashLogs()
else
{
//mCrashInfo["DebugLog"].erase("MinidumpPath");
- //To preserve logfile on clean shutdown move to regular log dir.
- std::string curr_log = (*lock)["dumpdir"].asString() + "SecondLife.log";
- std::string last_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
-
- LLFile::remove(last_log);
- LLFile::rename(curr_log, last_log); //Before we blow away the directory, perserve log of previous run.
mKeyMaster.cleanupProcess((*lock)["dumpdir"].asString());
}
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9bbc2031f63..d2e4136b9bf 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2103,12 +2103,6 @@ bool LLAppViewer::cleanup()
llinfos << "Goodbye!" << llendflush;
- //To preserve logfile on clean shutdown move to regular log dir.
- std::string curr_log = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"SecondLife.log");
- std::string last_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
- LLError::logToFile(""); //Close Secondlife.log
- LLFile::remove(last_log);
- LLFile::copy(curr_log, last_log);
removeDumpDir();
// return 0;
@@ -2246,8 +2240,6 @@ void LLAppViewer::initLoggingAndGetLastDuration()
// Rename current log file to ".old"
LLFile::rename(log_file, old_log_file);
- log_file = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,
- "SecondLife.log");
// Set the log file to SecondLife.log
LLError::logToFile(log_file);
if (!duration_log_msg.empty())
@@ -3733,9 +3725,6 @@ void LLAppViewer::handleViewerCrash()
// Close the debug file
pApp->writeDebugInfo(false); //false answers the isStatic question with the least overhead.
-
- LLError::logToFile("");
- pApp->removeMarkerFiles();
}
// static
--
GitLab