Skip to content
Snippets Groups Projects
Commit 0893b49e authored by Aura Linden's avatar Aura Linden
Browse files

The simple approach has not worked. This hybrid solution should avoid the...

The simple approach has not worked.  This hybrid solution should avoid the Windows issues and get us per-run logfiles.
parent 877f87a3
Branches
Tags
No related merge requests found
......@@ -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_LOGS,"SecondLife.old");
mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"SecondLife.log");
mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
}
......
......@@ -725,6 +725,13 @@ LLAppViewer::~LLAppViewer()
destroyMainloopTimeout();
#if !LL_WINDOWS
//Last thing, let's copy SL.log into the per-run directory. We don't care if this operation fails.
std::string per_run_log = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"SecondLife.log");
std::string current_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
LLFile::copy(per_run_log, current_log);
#endif
// If we got to this destructor somehow, the app didn't hang.
removeMarkerFiles();
}
......
......@@ -320,6 +320,10 @@ int LLCrashLoggerWindows::processingLoop() {
llinfos << "session ending.." << llendl;
LLSD options = getOptionData( LLApp::PRIORITY_COMMAND_LINE );
std::string per_run_file = options["dumpdir"].asString() + "SecondLife.log";
std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
LLFile::copy(per_run_file, log_file);
return 0;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment