summaryrefslogtreecommitdiff
path: root/indra/win_crash_logger
diff options
context:
space:
mode:
authorobscurestar <none@none>2014-01-26 02:56:23 -0800
committerobscurestar <none@none>2014-01-26 02:56:23 -0800
commit262f8b84737587fd5c2de38c34ff7a5594cca174 (patch)
treef29dde4cf5ad996bcacb0b16b5852bba02704daa /indra/win_crash_logger
parent33b0ae6ebf8a085a8795a9e5b02455fb7ebf0e6f (diff)
Was not using correct name for results of file search.
Diffstat (limited to 'indra/win_crash_logger')
-rw-r--r--indra/win_crash_logger/llcrashloggerwindows.cpp18
-rw-r--r--indra/win_crash_logger/llcrashloggerwindows.h4
2 files changed, 5 insertions, 17 deletions
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp
index 30c9cf551b..cd9b351fdb 100644
--- a/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -333,13 +333,11 @@ void LLCrashLoggerWindows::OnClientExited(void* context,
sInstance->mClientsConnected--;
}
-/*
+
void LLCrashLoggerWindows::OnClientDumpRequest(void* context,
const google_breakpad::ClientInfo* client_info,
const std::wstring* file_path)
{
- ProcessingLock lock;
-
if (!file_path)
{
llwarns << "dump with no file path" << llendl;
@@ -359,18 +357,8 @@ void LLCrashLoggerWindows::OnClientDumpRequest(void* context,
}
DWORD pid = client_info->pid();
-
-
-// Send the crash dump using a worker thread. This operation has retry
-// logic in case there is no internet connection at the time.
-DumpJobInfo* dump_job = new DumpJobInfo(pid, self, map,
-dump_location.value());
-if (!::QueueUserWorkItem(&CrashService::AsyncSendDump,
-dump_job, WT_EXECUTELONGFUNCTION)) {
-LOG(ERROR) << "could not queue job";
}
-}
-*/
+
bool LLCrashLoggerWindows::initCrashServer()
{
@@ -397,7 +385,7 @@ bool LLCrashLoggerWindows::initCrashServer()
mCrashHandler = new CrashGenerationServer( wpipe_name,
NULL,
&LLCrashLoggerWindows::OnClientConnected, this,
- NULL, NULL, // &LLCrashLoggerWindows::OnClientDumpRequest, this,
+ /*NULL, NULL, */ &LLCrashLoggerWindows::OnClientDumpRequest, this,
&LLCrashLoggerWindows::OnClientExited, this,
NULL, NULL,
true, &wdump_path);
diff --git a/indra/win_crash_logger/llcrashloggerwindows.h b/indra/win_crash_logger/llcrashloggerwindows.h
index 85cafd54c8..1812e2737e 100644
--- a/indra/win_crash_logger/llcrashloggerwindows.h
+++ b/indra/win_crash_logger/llcrashloggerwindows.h
@@ -68,10 +68,10 @@ private:
static void OnClientConnected(void* context,
const google_breakpad::ClientInfo* client_info);
- /*static void OnClientDumpRequest(
+ static void OnClientDumpRequest(
void* context,
const google_breakpad::ClientInfo* client_info,
- const std::wstring* file_path);*/
+ const std::wstring* file_path);
static void OnClientExited(void* context,
const google_breakpad::ClientInfo* client_info);