Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always write curl I/O debug info for the login attempt.

Browse Source
This commit is contained in:
Aleric Inglewood
2012-07-21 21:51:24 +02:00
parent 3a30f1dc71
commit fb38f6adea
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/aicurl.cpp
View File

@@ -887,6 +887,8 @@ static int curl_debug_callback(CURL*, curl_infotype infotype, char* buf, size_t
marker << (void*)request->get_lockobj(); marker << (void*)request->get_lockobj();
libcw_do.push_marker(); libcw_do.push_marker();
libcw_do.marker().assign(marker.str().data(), marker.str().size()); libcw_do.marker().assign(marker.str().data(), marker.str().size());
if (!debug::channels::dc::curlio.is_on())
debug::channels::dc::curlio.on();
LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT)) LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
switch (infotype) switch (infotype)
{ {

8
indra/newview/llstartup.cpp
View File

@@ -253,7 +253,9 @@ extern S32 gStartImageHeight;
// local globals // local globals
// //
#ifdef CWDEBUG
static bool gCurlIo;
#endif
static LLHost gAgentSimHost; static LLHost gAgentSimHost;
static BOOL gSkipOptionalUpdate = FALSE; static BOOL gSkipOptionalUpdate = FALSE;
@@ -1334,6 +1336,9 @@ bool idle_startup()
llinfos << "Authenticating with " << grid_uri << llendl; llinfos << "Authenticating with " << grid_uri << llendl;
// Always write curl I/O debug info for the login attempt.
Debug(gCurlIo = dc::curl.is_on() && !dc::curlio.is_on(); if (gCurlIo) dc::curlio.on());
// TODO if statement here to use web_login_key // TODO if statement here to use web_login_key
// OGPX : which routine would this end up in? the LLSD or XMLRPC, or ....? // OGPX : which routine would this end up in? the LLSD or XMLRPC, or ....?
LLUserAuth::getInstance()->authenticate( LLUserAuth::getInstance()->authenticate(
@@ -1408,6 +1413,7 @@ bool idle_startup()
LL_DEBUGS("AppInit") << "downloading..." << LL_ENDL; LL_DEBUGS("AppInit") << "downloading..." << LL_ENDL;
return FALSE; return FALSE;
} }
Debug(if (gCurlIo) dc::curlio.off()); // Login succeeded: restore dc::curlio to original state.
LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE ); LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );
progress += 0.01f; progress += 0.01f;
set_startup_status(progress, LLTrans::getString("LoginProcessingResponse"), auth_message); set_startup_status(progress, LLTrans::getString("LoginProcessingResponse"), auth_message);