From 0f91e061e4e3cea3bd42a14fece8f9654c7ca443 Mon Sep 17 00:00:00 2001 From: "~/.gitconfig" Date: Thu, 14 Aug 2014 17:37:10 +0300 Subject: [PATCH] handle prefix=null --- src/write_riemann.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/write_riemann.c b/src/write_riemann.c index 1ce6bfb4..a3b655a5 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -569,12 +569,21 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ format_name (name_buffer, sizeof (name_buffer), /* host = */ "", vl->plugin, vl->plugin_instance, vl->type, vl->type_instance); - if (host->always_append_ds || (ds->ds_num > 1)) + if (host->always_append_ds || (ds->ds_num > 1)) { + if (host->prefix == NULL) + ssnprintf (service_buffer, sizeof (service_buffer), + "%s/%s", &name_buffer[1], ds->ds[index].name); + else ssnprintf (service_buffer, sizeof (service_buffer), "%s/%s/%s", host->prefix, &name_buffer[1], ds->ds[index].name); - else + } else { + if (host->prefix == NULL) + sstrncpy (service_buffer, &name_buffer[1], + sizeof (service_buffer)); + else ssnprintf (service_buffer, sizeof (service_buffer), "%s/%s", host->prefix, &name_buffer[1]); + } event->service = strdup (service_buffer); -- 2.30.2