From 6de1d311f906058be07fc7f5a0431a23d53f26b1 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 20 Apr 2016 12:26:28 -0400
Subject: [PATCH] reset crash dump upload retries and timeouts
---
indra/llcrashlogger/llcrashlogger.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 7e52eb231ae..69a806bbea5 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -55,6 +55,9 @@ BOOL gSent = false;
int LLCrashLogger::ssl_mutex_count = 0;
LLCoreInt::HttpMutex ** LLCrashLogger::ssl_mutex_list = NULL;
+#define CRASH_UPLOAD_RETRIES 3 /* seconds */
+#define CRASH_UPLOAD_TIMEOUT 180 /* seconds */
+
class LLCrashLoggerHandler : public LLHttpSDHandler
{
LOG_CLASS(LLCrashLoggerHandler);
@@ -472,13 +475,13 @@ bool LLCrashLogger::sendCrashLog(std::string dump_dir)
msg = msg+mCrashHost.c_str();
updateApplication(msg.c_str());
- sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5);
+ sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT);
}
if(!sent)
{
updateApplication("Using default server...");
- sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to default server"), 3, 5);
+ sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to default server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT);
}
mSentCrashLogs = sent;
--
GitLab