}
if (status == 0) {
- user_data_t ud = {.data = st, .free_func = apache_free};
-
char callback_name[3 * DATA_MAX_NAME_LEN];
ssnprintf(callback_name, sizeof(callback_name), "apache/%s/%s",
(st->host != NULL) ? st->host : hostname_g,
(st->name != NULL) ? st->name : "default");
- status = plugin_register_complex_read(/* group = */ NULL,
- /* name = */ callback_name,
- /* callback = */ apache_read_host,
- /* interval = */ 0,
- /* user_data = */ &ud);
+ status = plugin_register_complex_read(
+ /* group = */ NULL,
+ /* name = */ callback_name,
+ /* callback = */ apache_read_host,
+ /* interval = */ 0, &(user_data_t){
+ .data = st, .free_func = apache_free,
+ });
}
if (status != 0) {
#endif
}
- curl_easy_setopt(st->curl, CURLOPT_URL, st->url);
curl_easy_setopt(st->curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(st->curl, CURLOPT_MAXREDIRS, 50L);
vl.values = &value;
vl.values_len = 1;
- sstrncpy(vl.host, (st->host != NULL) ? st->host : hostname_g,
- sizeof(vl.host));
+ if (st->host != NULL)
+ sstrncpy(vl.host, st->host, sizeof(vl.host));
sstrncpy(vl.plugin, "apache", sizeof(vl.plugin));
if (st->name != NULL)
} /* void submit_value */
static void submit_derive(const char *type, const char *type_instance,
- derive_t c, apache_t *st) {
- value_t v;
- v.derive = c;
- submit_value(type, type_instance, v, st);
+ derive_t d, apache_t *st) {
+ submit_value(type, type_instance, (value_t){.derive = d}, st);
} /* void submit_derive */
static void submit_gauge(const char *type, const char *type_instance, gauge_t g,
apache_t *st) {
- value_t v;
- v.gauge = g;
- submit_value(type, type_instance, v, st);
+ submit_value(type, type_instance, (value_t){.gauge = g}, st);
} /* void submit_gauge */
static void submit_scoreboard(char *buf, apache_t *st) {
assert(st->curl != NULL);
st->apache_buffer_fill = 0;
+
+ curl_easy_setopt(st->curl, CURLOPT_URL, st->url);
+
if (curl_easy_perform(st->curl) != CURLE_OK) {
ERROR("apache: curl_easy_perform failed: %s", st->apache_curl_error);
return (-1);