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

Fix to linux link 

Put timeout back into crashlogger post.
master
Rider Linden 2015-04-30 15:21:49 -07:00
parent 7c639f11a6
commit ef1b709c99
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/linux_crash_logger/CMakeLists.txt
View File

@ -61,6 +61,7 @@ set(LIBRT_LIBRARY rt)
target_link_libraries(linux-crash-logger
${LIBRT_LIBRARY}
${LLCRASHLOGGER_LIBRARIES}
${LLVFS_LIBRARIES}
${LLXML_LIBRARIES}
@ -68,7 +69,6 @@ target_link_libraries(linux-crash-logger
${LLVFS_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LIBRT_LIBRARY}
${LLCOMMON_LIBRARIES}
${BOOST_CONTEXT_LIBRARY}
${BOOST_COROUTINE_LIBRARY}

11
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -396,20 +396,23 @@ bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout)
{
LLCore::HttpRequest httpRequest;
LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions, false);
gBreak = false;
httpOpts->setTimeout(timeout);
for(int i = 0; i < retries; ++i)
{
updateApplication(llformat("%s, try %d...", msg.c_str(), i+1));
LLCoreHttpUtil::requestPostWithLLSD(&httpRequest, LLCore::HttpRequest::DEFAULT_POLICY_ID, 0,
host, data, NULL, NULL, new LLCrashLoggerHandler);
LLCoreHttpUtil::requestPostWithLLSD(httpRequest.get(), LLCore::HttpRequest::DEFAULT_POLICY_ID, 0,
host, data, httpOpts.get(), NULL, new LLCrashLoggerHandler);
while(!gBreak)
{
updateApplication(); // No new message, just pump the IO
httpRequest.update(0L);
httpRequest->update(0L);
}
if(gSent)
{