X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwrite_riemann.c;h=20f2e10b91b50b4fe0165db17dec7ff9b7449ef3;hb=0a95b83f89a553be1ac2beae2003927e74230d23;hp=043a06b0a55e9b1dfdf01291f253fc02586ce322;hpb=f91dc17b98157dfd785759cf71e009a0e9c1a520;p=collectd.git diff --git a/src/write_riemann.c b/src/write_riemann.c index 043a06b0..20f2e10b 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -100,6 +100,7 @@ static int wrr_connect(struct riemann_host *host) /* {{{ */ node, port); return -1; } +#if RCC_VERSION_NUMBER >= 0x010800 if (host->timeout.tv_sec != 0) { if (riemann_client_set_timeout(host->client, &host->timeout) != 0) { riemann_client_free(host->client); @@ -110,6 +111,7 @@ static int wrr_connect(struct riemann_host *host) /* {{{ */ return -1; } } +#endif set_sock_opts(riemann_client_get_fd(host->client)); @@ -679,9 +681,13 @@ static int wrr_config_node(oconfig_item_t *ci) /* {{{ */ if (status != 0) break; } else if (strcasecmp("Timeout", child->key) == 0) { +#if RCC_VERSION_NUMBER >= 0x010800 status = cf_util_get_int(child, (int *)&host->timeout.tv_sec); if (status != 0) break; +#else + WARNING("write_riemann plugin: The Timeout option is not supported. Please upgrade the Riemann client to at least 1.8.0."); +#endif } else if (strcasecmp("Port", child->key) == 0) { host->port = cf_util_get_port_number(child); if (host->port == -1) {