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

On failed transfer, print CURLINFO_OS_ERRNO when available.

Browse Source
This commit is contained in:
Aleric Inglewood
2012-10-14 03:13:32 +02:00
parent ccd98c3c3d
commit 9fba54ad5d
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/aistatemachine/aicurlthread.cpp
View File

@@ -864,10 +864,9 @@ AICurlThread::~AICurlThread()
} }
#if LL_WINDOWS #if LL_WINDOWS
static std::string formatWSAError() static std::string formatWSAError(int e = WSAGetLastError())
{ {
std::ostringstream r; std::ostringstream r;
int e = WSAGetLastError();
LPTSTR error_str = 0; LPTSTR error_str = 0;
r << e; r << e;
if(FormatMessage( if(FormatMessage(
@@ -884,9 +883,9 @@ static std::string formatWSAError()
return r.str(); return r.str();
} }
#elif WINDOWS_CODE #elif WINDOWS_CODE
static std::string formatWSAError() static std::string formatWSAError(int e = errno)
{ {
return strerror(errno); return strerror(e);
} }
#endif #endif
@@ -1675,7 +1674,21 @@ void MultiHandle::finish_easy_request(AICurlEasyRequest const& easy_request, CUR
{ {
namelookup_time = 0; namelookup_time = 0;
} }
Dout(dc::curl|continued_cf, "Finished: " << eff_url << " (" << curl_easy_strerror(result) << "); "); Dout(dc::curl|continued_cf, "Finished: " << eff_url << " (" << curl_easy_strerror(result));
if (result != CURLE_OK)
{
long os_error;
curl_easy_request_w->getinfo(CURLINFO_OS_ERRNO, &os_error);
if (os_error)
{
#if WINDOWS_CODE
Dout(dc::continued, ": " << formatWSAError(os_error));
#else
Dout(dc::continued, ": " << strerror(os_error));
#endif
}
}
Dout(dc::continued, "); ");
if (namelookup_time) if (namelookup_time)
{ {
Dout(dc::continued, "namelookup time: " << namelookup_time << ", "); Dout(dc::continued, "namelookup time: " << namelookup_time << ", ");