smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build a new curl "handle" at everyrequest instead of reusing the same one.

This commit is contained in:
Matthieu Gautier 2023-02-07 10:18:21 +01:00
parent a74aaa5b13
commit 95ebb6a492
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/aria2.cpp
View File

@ -24,7 +24,7 @@
#define LOG_ARIA_ERROR() \ #define LOG_ARIA_ERROR() \
{ \ { \
std::cerr << "ERROR: aria2 RPC request failed. (" << res << ")." << std::endl; \ std::cerr << "ERROR: aria2 RPC request failed. (" << res << ")." << std::endl; \
std::cerr << (m_curlErrorBuffer[0] ? m_curlErrorBuffer.get() : curl_easy_strerror(res)) << std::endl; \ std::cerr << (curlErrorBuffer[0] ? curlErrorBuffer : curl_easy_strerror(res)) << std::endl; \
} }
namespace kiwix { namespace kiwix {
@ -32,9 +32,7 @@ namespace kiwix {
Aria2::Aria2(): Aria2::Aria2():
mp_aria(nullptr), mp_aria(nullptr),
m_port(42042), m_port(42042),
m_secret(getNewRpcSecret()), m_secret(getNewRpcSecret())
m_curlErrorBuffer(new char[CURL_ERROR_SIZE]),
mp_curl(nullptr)
{ {
m_downloadDir = getDataDirectory(); m_downloadDir = getDataDirectory();
makeDirectory(m_downloadDir); makeDirectory(m_downloadDir);
@ -91,26 +89,28 @@ Aria2::Aria2():
launchCmd.append(cmd).append(" "); launchCmd.append(cmd).append(" ");
} }
mp_aria = Subprocess::run(callCmd); mp_aria = Subprocess::run(callCmd);
mp_curl = curl_easy_init();
curl_easy_setopt(mp_curl, CURLOPT_URL, "http://localhost/rpc"); CURL* p_curl = curl_easy_init();
curl_easy_setopt(mp_curl, CURLOPT_PORT, m_port); char curlErrorBuffer[CURL_ERROR_SIZE];
curl_easy_setopt(mp_curl, CURLOPT_POST, 1L);
curl_easy_setopt(mp_curl, CURLOPT_ERRORBUFFER, m_curlErrorBuffer.get()); curl_easy_setopt(p_curl, CURLOPT_URL, "http://localhost/rpc");
curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
int watchdog = 50; int watchdog = 50;
while(--watchdog) { while(--watchdog) {
sleep(10); sleep(10);
m_curlErrorBuffer[0] = 0; curlErrorBuffer[0] = 0;
auto res = curl_easy_perform(mp_curl); auto res = curl_easy_perform(p_curl);
if (res == CURLE_OK) { if (res == CURLE_OK) {
break; break;
} else if (watchdog == 1) { } else if (watchdog == 1) {
LOG_ARIA_ERROR(); LOG_ARIA_ERROR();
} }
} }
curl_easy_cleanup(p_curl);
if (!watchdog) { if (!watchdog) {
curl_easy_cleanup(mp_curl);
throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd); throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd);
} }
} }
@ -118,7 +118,6 @@ Aria2::Aria2():
Aria2::~Aria2() Aria2::~Aria2()
{ {
std::unique_lock<std::mutex> lock(m_lock); std::unique_lock<std::mutex> lock(m_lock);
curl_easy_cleanup(mp_curl);
} }
void Aria2::close() void Aria2::close()
@ -142,17 +141,25 @@ std::string Aria2::doRequest(const MethodCall& methodCall)
long response_code; long response_code;
{ {
std::unique_lock<std::mutex> lock(m_lock); std::unique_lock<std::mutex> lock(m_lock);
curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDSIZE, requestContent.size()); char curlErrorBuffer[CURL_ERROR_SIZE];
curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDS, requestContent.c_str()); CURL* p_curl = curl_easy_init();
curl_easy_setopt(mp_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss); curl_easy_setopt(p_curl, CURLOPT_URL, "http://localhost/rpc");
curl_easy_setopt(mp_curl, CURLOPT_WRITEDATA, &outStream); curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
m_curlErrorBuffer[0] = 0; curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
res = curl_easy_perform(mp_curl); curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
curl_easy_setopt(p_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
curl_easy_setopt(p_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
curl_easy_setopt(p_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
curl_easy_setopt(p_curl, CURLOPT_WRITEDATA, &outStream);
curlErrorBuffer[0] = 0;
res = curl_easy_perform(p_curl);
if (res != CURLE_OK) { if (res != CURLE_OK) {
LOG_ARIA_ERROR(); LOG_ARIA_ERROR();
curl_easy_cleanup(p_curl);
throw std::runtime_error("Cannot perform request"); throw std::runtime_error("Cannot perform request");
} }
curl_easy_getinfo(mp_curl, CURLINFO_RESPONSE_CODE, &response_code); curl_easy_getinfo(p_curl, CURLINFO_RESPONSE_CODE, &response_code);
curl_easy_cleanup(p_curl);
} }
auto responseContent = outStream.str(); auto responseContent = outStream.str();

3
src/aria2.h
View File

@ -24,10 +24,7 @@ class Aria2
int m_port; int m_port;
std::string m_secret; std::string m_secret;
std::string m_downloadDir; std::string m_downloadDir;
std::unique_ptr<char[]> m_curlErrorBuffer;
CURL* mp_curl;
std::mutex m_lock; std::mutex m_lock;
std::string doRequest(const MethodCall& methodCall); std::string doRequest(const MethodCall& methodCall);
public: public: