From: Florian Forster <octo@collectd.org>
Date: Fri, 22 Aug 2014 05:23:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/706'
X-Git-Tag: collectd-5.5.0~219
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=bca0f0af973fcd4b34e3cf6072e193ac9dbc65fc;p=collectd.git

Merge remote-tracking branch 'github/pr/706'

Conflicts:
	src/write_riemann.c
---

bca0f0af973fcd4b34e3cf6072e193ac9dbc65fc
diff --cc src/write_riemann.c
index b59c3e35,61c13914..c3740e1d
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@@ -569,11 -570,19 +570,22 @@@ static Event *riemann_value_to_protobuf
  			/* host = */ "", vl->plugin, vl->plugin_instance,
  			vl->type, vl->type_instance);
  	if (host->always_append_ds || (ds->ds_num > 1))
- 		ssnprintf (service_buffer, sizeof (service_buffer),
- 				"%s/%s", &name_buffer[1], ds->ds[index].name);
 -		if (host->event_service_prefix == NULL || host->event_service_prefix[0] == '\0')
 -			ssnprintf (service_buffer, sizeof (service_buffer),
 -					"%s/%s", &name_buffer[1], ds->ds[index].name);
++	{
++		if (host->event_service_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->event_service_prefix, &name_buffer[1], ds->ds[index].name);
++			ssnprintf (service_buffer, sizeof (service_buffer), "%s%s/%s",
++					host->event_service_prefix, &name_buffer[1], ds->ds[index].name);
++	}
  	else
- 		sstrncpy (service_buffer, &name_buffer[1],
- 				sizeof (service_buffer));
 -		if (host->event_service_prefix == NULL || host->event_service_prefix[0] == '\0')
 -			sstrncpy (service_buffer, &name_buffer[1],
 -					sizeof (service_buffer));
++	{
++		if (host->event_service_prefix == NULL)
++			sstrncpy (service_buffer, &name_buffer[1], sizeof (service_buffer));
+ 		else
 -			ssnprintf (service_buffer, sizeof (service_buffer),
 -					"%s%s", host->event_service_prefix, &name_buffer[1]);
++			ssnprintf (service_buffer, sizeof (service_buffer), "%s%s",
++					host->event_service_prefix, &name_buffer[1]);
++	}
  
  	event->service = strdup (service_buffer);
  
@@@ -751,14 -760,18 +763,18 @@@ static int riemann_config_node(oconfig_
  			status = cf_util_get_string (child, &host->node);
  			if (status != 0)
  				break;
 -        } else if (strcasecmp ("Notifications", child->key) == 0) {
 -            status = cf_util_get_boolean(child, &host->notifications);
 -            if (status != 0)
 -                break;
 -        } else if (strcasecmp ("EventServicePrefix", child->key) == 0) {
 -            status = cf_util_get_string (child, &host->event_service_prefix);
 -            if (status != 0)
 -                break;
 -        } else if (strcasecmp ("CheckThresholds", child->key) == 0) {
 -            status = cf_util_get_boolean(child, &host->check_thresholds);
 -            if (status != 0)
 -                break;
 +		} else if (strcasecmp ("Notifications", child->key) == 0) {
 +			status = cf_util_get_boolean(child, &host->notifications);
 +			if (status != 0)
 +				break;
++		} else if (strcasecmp ("EventServicePrefix", child->key) == 0) {
++			status = cf_util_get_string (child, &host->event_service_prefix);
++			if (status != 0)
++				break;
 +		} else if (strcasecmp ("CheckThresholds", child->key) == 0) {
 +			status = cf_util_get_boolean(child, &host->check_thresholds);
 +			if (status != 0)
 +				break;
  		} else if (strcasecmp ("Port", child->key) == 0) {
  			status = cf_util_get_service (child, &host->service);
  			if (status != 0) {