dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-06 02:26:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reusing CURL object. Printing timing stats on upload thread

Browse Source
This commit is contained in:
Matt Hill
2015-02-02 23:07:46 -05:00
parent 8fb54afe70
commit 030ec56163
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/daemon.cpp
View File

@@ -387,6 +387,8 @@ bool writeToQueue(std::string jsonResult)
void dataUploadThread(void* arg) void dataUploadThread(void* arg)
{ {
CURL *curl;
/* In windows, this will init the winsock stuff */ /* In windows, this will init the winsock stuff */
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
@@ -401,6 +403,8 @@ void dataUploadThread(void* arg)
{ {
try try
{ {
/* get a curl handle */
curl = curl_easy_init();
Beanstalk::Client client(BEANSTALK_QUEUE_HOST, BEANSTALK_PORT); Beanstalk::Client client(BEANSTALK_QUEUE_HOST, BEANSTALK_PORT);
client.watch(BEANSTALK_TUBE_NAME); client.watch(BEANSTALK_TUBE_NAME);
@@ -414,7 +418,7 @@ void dataUploadThread(void* arg)
if (job.id() > 0) if (job.id() > 0)
{ {
//LOG4CPLUS_DEBUG(logger, job.body() ); //LOG4CPLUS_DEBUG(logger, job.body() );
if (uploadPost(udata->upload_url, job.body())) if (uploadPost(curl, udata->upload_url, job.body()))
{ {
client.del(job.id()); client.del(job.id());
LOG4CPLUS_INFO(logger, "Job: " << job.id() << " successfully uploaded" ); LOG4CPLUS_INFO(logger, "Job: " << job.id() << " successfully uploaded" );
@@ -432,6 +436,8 @@ void dataUploadThread(void* arg)
} }
/* always cleanup */
curl_easy_cleanup(curl);
} }
catch (const std::runtime_error& error) catch (const std::runtime_error& error)
{ {
@@ -445,10 +451,9 @@ void dataUploadThread(void* arg)
} }
bool uploadPost(std::string url, std::string data) bool uploadPost(CURL* curl, std::string url, std::string data)
{ {
bool success = true; bool success = true;
CURL *curl;
CURLcode res; CURLcode res;
struct curl_slist *headers=NULL; // init to NULL is important struct curl_slist *headers=NULL; // init to NULL is important
@@ -457,8 +462,6 @@ bool uploadPost(std::string url, std::string data)
headers = curl_slist_append( headers, "Content-Type: application/json"); headers = curl_slist_append( headers, "Content-Type: application/json");
headers = curl_slist_append( headers, "charsets: utf-8"); headers = curl_slist_append( headers, "charsets: utf-8");
/* get a curl handle */
curl = curl_easy_init();
if(curl) { if(curl) {
/* Add the headers */ /* Add the headers */
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
@@ -480,8 +483,6 @@ bool uploadPost(std::string url, std::string data)
success = false; success = false;
} }
/* always cleanup */
curl_easy_cleanup(curl);
} }
return success; return success;