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

Update of print_diagnostics.

Browse Source 
CURLE_COULDNT_CONNECT only happens when we actually get
an error (ie, 'connection refused'). If we time out while the connect
attempt is still running then we get CURLE_OPERATION_TIMEDOUT.
This commit is contained in:
Aleric Inglewood
2012-12-30 21:11:10 +01:00
parent 36a79d7cbe
commit 2f3841d7e6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmessage/aicurlthread.cpp
View File

@@ -2014,12 +2014,11 @@ void HTTPTimeout::print_diagnostics(CurlEasyRequest const* curl_easy_request, ch
#if LOWRESTIMER #if LOWRESTIMER
llinfos << "Hostname seems to have been still in the DNS cache." << llendl; llinfos << "Hostname seems to have been still in the DNS cache." << llendl;
#else #else
llwarns << "Huh? Curl returned CURLE_OPERATION_TIMEDOUT, but DNS lookup did not occur according to timings. Expected CURLE_COULDNT_RESOLVE_PROXY or CURLE_COULDNT_RESOLVE_HOST!" << llendl; llwarns << "Curl returned CURLE_OPERATION_TIMEDOUT and DNS lookup did not occur according to timings. Apparently the resolve attempt timed out (bad network?)" << llendl;
llassert(connect_time == 0); llassert(connect_time == 0);
llassert(appconnect_time == 0); llassert(appconnect_time == 0);
llassert(pretransfer_time == 0); llassert(pretransfer_time == 0);
llassert(starttransfer_time == 0); llassert(starttransfer_time == 0);
// Fatal error for diagnostics.
return; return;
#endif #endif
} }
@@ -2042,11 +2041,10 @@ void HTTPTimeout::print_diagnostics(CurlEasyRequest const* curl_easy_request, ch
#endif #endif
) )
{ {
llwarns << "Huh? Curl returned CURLE_OPERATION_TIMEDOUT, but connection did not occur according to timings. Expected CURLE_COULDNT_CONNECT!" << llendl; llwarns << "Curl returned CURLE_OPERATION_TIMEDOUT and connection did not occur according to timings: apparently the connect attempt timed out (bad network?)" << llendl;
llassert(appconnect_time == 0); llassert(appconnect_time == 0);
llassert(pretransfer_time == 0); llassert(pretransfer_time == 0);
llassert(starttransfer_time == 0); llassert(starttransfer_time == 0);
// Fatal error for diagnostics.
return; return;
} }
// If connect_time is almost equal to namelookup_time, then it was just set because it was already connected. // If connect_time is almost equal to namelookup_time, then it was just set because it was already connected.