livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.

master
Aura Linden 2014-03-20 12:04:39 -07:00
parent 8d5b933ad0
commit 35ab71d8ea
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -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());
}

11
indra/newview/llappviewer.cpp
View File

@ -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