From: ~/.gitconfig <moshe@forter.com>
Date: Sun, 17 Aug 2014 08:45:19 +0000 (+0300)
Subject: ignore EventServicePrefix when its empty ("")
X-Git-Tag: collectd-5.5.0~219^2~4
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=820f3b25c7ead76617cc843cfe2e2c364b226f82;p=collectd.git

ignore EventServicePrefix when its empty ("")
---

diff --git a/src/write_riemann.c b/src/write_riemann.c
index 32c034c6..7f0211f6 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -570,14 +570,14 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
 			/* host = */ "", vl->plugin, vl->plugin_instance,
 			vl->type, vl->type_instance);
 	if (host->always_append_ds || (ds->ds_num > 1))
-		if (host->prefix == NULL)
+		if (host->prefix == NULL || host->prefix[0] == '\0')
 			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
-		if (host->prefix == NULL)
+		if (host->prefix == NULL || host->prefix[0] == '\0')
 			sstrncpy (service_buffer, &name_buffer[1],
 					sizeof (service_buffer));
 		else