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

rollback hardcoded version

meow-7.2.2
Glenn Glazer 2016-02-25 10:28:38 -08:00
parent cc79b5663f
commit 281521fe42
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -233,23 +233,31 @@ void LLCrashLogger::gatherFiles()
gatherPlatformSpecificFiles();
//Construct crash report URL
//CNAMES for the VIPs are viewercrashreport.{agni, damballah}.lindenlab.com
std::string grid = mDebugLog["GridName"].asString();
LLStringUtil::toLower(grid);
if(grid == "agni")
{
mCrashHost = "https://viewercrashreport.agni.lindenlab.com/cgi-bin/viewercrashreceiver.py";
}
else
{
mCrashHost = "https://viewercrashreport.damballah.lindenlab.com/cgi-bin/viewercrashreceiver.py";
}
//Use the debug log to reconstruct the URL to send the crash report to
if(mDebugLog.has("CrashHostUrl"))
{
// Crash log receiver has been manually configured.
mCrashHost = mDebugLog["CrashHostUrl"].asString();
}
else if(mDebugLog.has("CurrentSimHost"))
{
mCrashHost = "https://";
mCrashHost += mDebugLog["CurrentSimHost"].asString();
mCrashHost += ":12043/crash/report";
}
else if(mDebugLog.has("GridName"))
{
// This is a 'little' hacky, but its the best simple solution.
std::string grid_host = mDebugLog["GridName"].asString();
LLStringUtil::toLower(grid_host);
mCrashHost = "https://login.";
mCrashHost += grid_host;
mCrashHost += ".lindenlab.com:12043/crash/report";
}
// Use login servers as the alternate, since they are already load balanced and have a known name
mAltCrashHost = mCrashHost;
mAltCrashHost = "https://login.agni.lindenlab.com:12043/crash/report";
mCrashInfo["DebugLog"] = mDebugLog;
mFileMap["StatsLog"] = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"stats.log");