X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcurl.c;h=9d2196ac2c3e57d30858eebcbf83bdb39f4d6970;hb=d404a0c4f97ef047c2add2e27f2424f01bc45ad7;hp=e35b2580a4eb8fe019f1c633f47a71129ca23d41;hpb=54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a;p=collectd.git diff --git a/src/curl.c b/src/curl.c index e35b2580..9d2196ac 100644 --- a/src/curl.c +++ b/src/curl.c @@ -325,7 +325,10 @@ static int cc_config_add_match (web_page_t *page, /* {{{ */ } /* while (status == 0) */ if (status != 0) + { + cc_web_match_free (match); return (status); + } match->match = match_create_simple (match->regex, match->exclude_regex, match->dstype); @@ -569,6 +572,7 @@ static int cc_init (void) /* {{{ */ INFO ("curl plugin: No pages have been defined."); return (-1); } + curl_global_init (CURL_GLOBAL_SSL); return (0); } /* }}} int cc_init */ @@ -640,7 +644,7 @@ static int cc_read_page (web_page_t *wp) /* {{{ */ status = curl_easy_perform (wp->curl); if (status != CURLE_OK) { - ERROR ("curl plugin: curl_easy_perform failed with staus %i: %s", + ERROR ("curl plugin: curl_easy_perform failed with status %i: %s", status, wp->curl_errbuf); return (-1); } @@ -653,7 +657,7 @@ static int cc_read_page (web_page_t *wp) /* {{{ */ long response_code = 0; status = curl_easy_getinfo(wp->curl, CURLINFO_RESPONSE_CODE, &response_code); if(status != CURLE_OK) { - ERROR ("curl plugin: Fetching response code failed with staus %i: %s", + ERROR ("curl plugin: Fetching response code failed with status %i: %s", status, wp->curl_errbuf); } else { cc_submit_response_code(wp, response_code); @@ -679,6 +683,7 @@ static int cc_read_page (web_page_t *wp) /* {{{ */ } cc_submit (wp, wm, mv); + match_value_reset (mv); } /* for (wm = wp->matches; wm != NULL; wm = wm->next) */ return (0);