diff options
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index df446a7239..df939a9c99 100755 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -1,4 +1,4 @@ -/** + /** * @file llcrashlogger.cpp * @brief Crash logger implementation * @@ -144,9 +144,18 @@ void LLCrashLogger::gatherFiles() mCrashHost = "https://"; mCrashHost += mDebugLog["CurrentSimHost"].asString(); mCrashHost += ":12043/crash/report"; - mAltCrashHost = "https://"; - mAltCrashHost += mDebugLog["GridUtilHost"].asString(); - mAltCrashHost += ":12043/crash/report"; + // Use login servers as the alternate, since they are already load balanced and have a known name + // First, check to see if we have a valid grid name. If not, use agni. + mAltCrashHost = "https://login."; + if(mDebugLog["GridName"].asString() != "") + { + mAltCrashHost += mDebugLog["GridName"].asString(); + } + else + { + mAltCrashHost += "agni"; + } + mAltCrashHost += ".lindenlab.com:12043/crash/report"; mCrashInfo["DebugLog"] = mDebugLog; mFileMap["StatsLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stats.log"); @@ -230,9 +239,6 @@ bool LLCrashLogger::sendCrashLogs() updateApplication("Sending logs..."); } - //util.* servers no longer have a public interface, so there's no alternate server anymore. - //leaving this in if we decide we need another alternate server for crash report receiving. - /* if(!gSent) { gBreak = false; @@ -243,7 +249,7 @@ bool LLCrashLogger::sendCrashLogs() updateApplication("Sending logs to Alternate Server..."); } } - */ + mSentCrashLogs = gSent; |