Fix invalid CURL handle issue

pschlan · Feb 1, 2017 · 80ee7f7 · 80ee7f7
1 parent 283d22c
commit 80ee7f7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/chronos/App.cpp b/chronos/App.cpp
@@ -91,7 +91,7 @@ void App::processJobs(int hour, int minute, int month, int mday, int wday, int y
 		MYSQL_ROW row;
 		while((row = res->fetchRow()) != nullptr)
 		{
-			HTTPRequest *req = HTTPRequest::fromURL(row[0], atoi(row[10]), wt);
+			HTTPRequest *req = HTTPRequest::fromURL(row[0], atoi(row[10]));
 			req->result->jobID 			= atoi(row[1]);
 			req->result->datePlanned	= (uint64_t)timestamp * 1000;
 			req->result->notifyFailure 	= strcmp(row[5], "1") == 0;

diff --git a/chronos/HTTPRequest.cpp b/chronos/HTTPRequest.cpp
@@ -44,9 +44,8 @@ size_t curlHeaderFunction(char *buffer, size_t size, size_t nitems, void *userda
 
 }
 
-HTTPRequest::HTTPRequest(CURLM *curlMultiHandle)
-	: multiHandle{curlMultiHandle},
-	  result{std::make_unique<JobResult>()}
+HTTPRequest::HTTPRequest()
+	: result{std::make_unique<JobResult>()}
 {
 	maxSize = App::getInstance()->config->getInt("request_max_size");
 	memset(curlError, 0, sizeof(curlError));
@@ -177,8 +176,10 @@ void HTTPRequest::done(CURLcode res)
 		onDone();
 }
 
-void HTTPRequest::submit()
+void HTTPRequest::submit(CURLM *curlMultiHandle)
 {
+	multiHandle 		= curlMultiHandle;
+
 	result->dateStarted 	= Utils::getTimestampMS();
 	result->jitter 			= result->dateStarted - result->datePlanned;
 
@@ -234,9 +235,9 @@ void HTTPRequest::submit()
 	}
 }
 
-HTTPRequest *HTTPRequest::fromURL(const std::string &url, int userID, const std::shared_ptr<WorkerThread> &wt)
+HTTPRequest *HTTPRequest::fromURL(const std::string &url, int userID)
 {
-	HTTPRequest *req = new HTTPRequest(wt->curlHandle);
+	HTTPRequest *req = new HTTPRequest();
 	req->result->userID = userID;
 	req->result->url = url;
 	req->url = url;

diff --git a/chronos/HTTPRequest.h b/chronos/HTTPRequest.h
@@ -26,7 +26,7 @@ namespace Chronos
 	class HTTPRequest
 	{
 	private:
-		HTTPRequest(CURLM *curlMultiHandle);
+		HTTPRequest();
 
 		HTTPRequest(const HTTPRequest &other) = delete;
 		HTTPRequest(HTTPRequest &&other) = delete;
@@ -37,9 +37,9 @@ namespace Chronos
 		~HTTPRequest();
 
 	public:
-		static HTTPRequest *fromURL(const std::string &url, int userID, const std::shared_ptr<WorkerThread> &wt);
+		static HTTPRequest *fromURL(const std::string &url, int userID);
 
-		void submit();
+		void submit(CURLM *curlMultiHandle);
 		void done(CURLcode res);
 
 		bool processData(const std::string &headers);

diff --git a/chronos/WorkerThread.cpp b/chronos/WorkerThread.cpp
@@ -182,7 +182,7 @@ void WorkerThread::runJobs()
 		++runningJobs;
 
 		job->onDone = std::bind(&WorkerThread::jobDone, this, job);
-		job->submit();
+		job->submit(curlHandle);
 	}
 }