tastytea
/
mastodonpp
2
1
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

make_request(): Return complete answer_type, 

and don't throw if curl_easy_perform() fails.
This commit is contained in:
tastytea 2020-01-05 12:22:26 +01:00
parent 078130bac6
commit 31950d280d
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/curl_wrapper.cpp
View File

@ -16,10 +16,16 @@
#include "curl_wrapper.hpp"
#include "exceptions.hpp"
#include "log.hpp"
#include <cstdint>
namespace mastodonpp
{
using std::uint8_t;
using std::uint16_t;
CURLWrapper::CURLWrapper()
: _curl_buffer_error{}
{
@ -67,15 +73,27 @@ answer_type CURLWrapper::make_request(const http_method &method,
throw CURLException{code, "Failed to set URI", _curl_buffer_error};
}
answer_type answer;
code = curl_easy_perform(_connection);
if (code != CURLE_OK)
if (code == CURLE_OK)
{
throw CURLException{code, "Failed to perform request",
_curl_buffer_error};
long http_status; // NOLINT(google-runtime-int)
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
curl_easy_getinfo(_connection, CURLINFO_RESPONSE_CODE, &http_status);
answer.http_status = static_cast<uint16_t>(http_status);
debuglog << "HTTP status code: " << http_status << '\n';
answer.headers = _curl_buffer_headers;
answer.body = _curl_buffer_body;
}
else
{
answer.curl_error_code = static_cast<uint8_t>(code);
answer.error_message = _curl_buffer_error;
debuglog << "libcurl error: " << code << '\n';
debuglog << _curl_buffer_error << '\n';
}
answer_type answer;
answer.body = _curl_buffer;
return answer;
}