X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fapache.c;h=16f7acd310e6f098f1e3021a6f8ce5237fc429b0;hb=e0eedd800886e1f4a6e0b16f6ae95c3201a14fb7;hp=8458ce15d1c9b58bdd8c9c24220e844242443f3a;hpb=9de567ab3fd0725ce08f0581b6374518e1220e7e;p=collectd.git diff --git a/src/apache.c b/src/apache.c index 8458ce15..16f7acd3 100644 --- a/src/apache.c +++ b/src/apache.c @@ -78,6 +78,7 @@ static void apache_free (apache_t *st) curl_easy_cleanup(st->curl); st->curl = NULL; } + sfree (st); } /* apache_free */ static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, @@ -671,9 +672,18 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */ return (0); } /* }}} int apache_read_host */ +static int apache_init (void) /* {{{ */ +{ + /* Call this while collectd is still single-threaded to avoid + * initialization issues in libgcrypt. */ + curl_global_init (CURL_GLOBAL_SSL); + return (0); +} /* }}} int apache_init */ + void module_register (void) { plugin_register_complex_config ("apache", config); + plugin_register_init ("apache", apache_init); } /* void module_register */ /* vim: set sw=8 noet fdm=marker : */