diff --git a/include/downloader.h b/include/downloader.h index 35d44f62c..b60e48136 100644 --- a/include/downloader.h +++ b/include/downloader.h @@ -97,7 +97,6 @@ class Downloader size_t getNbDownload() { return m_knownDownloads.size(); } std::vector getDownloadIds(); - const std::string &getAria2LaunchCmd(); private: std::map> m_knownDownloads; diff --git a/src/aria2.cpp b/src/aria2.cpp index 07dfbdb03..9c6da41a9 100644 --- a/src/aria2.cpp +++ b/src/aria2.cpp @@ -78,8 +78,9 @@ Aria2::Aria2(): callCmd.push_back("--max-concurrent-downloads=42"); callCmd.push_back("--rpc-max-request-size=6M"); callCmd.push_back("--file-allocation=none"); + std::string launchCmd; for (auto &cmd : callCmd) { - m_launchCmd.append(cmd).append(" "); + launchCmd.append(cmd).append(" "); } mp_aria = Subprocess::run(callCmd); mp_curl = curl_easy_init(); @@ -108,7 +109,7 @@ Aria2::Aria2(): } if (!watchdog) { curl_easy_cleanup(mp_curl); - throw std::runtime_error("Cannot connect to aria2c rpc"); + throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd); } } diff --git a/src/aria2.h b/src/aria2.h index 6d7262479..898904a5d 100644 --- a/src/aria2.h +++ b/src/aria2.h @@ -26,7 +26,6 @@ class Aria2 std::string m_downloadDir; CURL* mp_curl; pthread_mutex_t m_lock; - std::string m_launchCmd; std::string doRequest(const MethodCall& methodCall); @@ -44,7 +43,6 @@ class Aria2 void pause(const std::string& gid); void unpause(const std::string& gid); void remove(const std::string& gid); - const std::string &getLaunchCmd() { return m_launchCmd; }; }; }; //end namespace kiwix diff --git a/src/downloader.cpp b/src/downloader.cpp index 504e3fdd4..393810d2a 100644 --- a/src/downloader.cpp +++ b/src/downloader.cpp @@ -163,11 +163,6 @@ std::vector Downloader::getDownloadIds() { return ret; } -const std::string &Downloader::getAria2LaunchCmd() -{ - return mp_aria->getLaunchCmd(); -} - Download* Downloader::startDownload(const std::string& uri) { for (auto& p: m_knownDownloads) {