int reference_count;
};
-static char *sensu_tags;
-static char **sensu_attrs;
+static char *sensu_tags = NULL;
+static char **sensu_attrs = NULL;
static size_t sensu_attrs_num;
static int add_str_to_list(struct str_list *strs,
}
// incorporate sensu tags from config if any
- if (strlen(sensu_tags) != 0) {
+ if ((sensu_tags != NULL) && (strlen(sensu_tags) != 0)) {
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
const char *p, *q;
size_t oldlen = strlen(old);
size_t count = strlen(new);
- size_t retlen = count;
+ size_t retlen;
size_t newlen = count;
int samesize = (oldlen == newlen);
char *handlers_str = build_json_str_list("handlers", &(host->notification_handlers));
if (handlers_str == NULL) {
ERROR("write_sensu plugin: Unable to alloc memory");
+ free(ret_str);
return NULL;
}
// incorporate the handlers
}
// incorporate sensu tags from config if any
- if (strlen(sensu_tags) != 0) {
+ if ((sensu_tags != NULL) && (strlen(sensu_tags) != 0)) {
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
char *msg = replace_json_reserved(n->message);
if (msg == NULL) {
ERROR("write_sensu plugin: Unable to alloc memory");
+ free(ret_str);
return NULL;
}
res = asprintf(&temp_str, "%s, \"output\": \"%s - %s\"", ret_str, severity, msg);
sensu_tags_arr.nb_strs = 0;
sensu_tags_arr.strs = NULL;
- sensu_tags = malloc(sizeof(char));
- if (sensu_tags == NULL) {
- ERROR("write_sensu plugin: Unable to alloc memory");
- return -1;
- }
- sensu_tags[0] = '\0';
for (i = 0; i < ci->children_num; i++) {
child = &ci->children[i];
if (strcasecmp("Node", child->key) == 0) {
sensu_config_node(child);
} else if (strcasecmp(child->key, "attribute") == 0) {
- char *key = NULL;
- char *val = NULL;
-
if (child->values_num != 2) {
WARNING("sensu attributes need both a key and a value.");
- free(sensu_tags);
- return -1;
+ continue;
}
if (child->values[0].type != OCONFIG_TYPE_STRING ||
- child->values[1].type != OCONFIG_TYPE_STRING) {
+ child->values[1].type != OCONFIG_TYPE_STRING) {
WARNING("sensu attribute needs string arguments.");
- free(sensu_tags);
- return -1;
- }
- if ((key = strdup(child->values[0].value.string)) == NULL) {
- ERROR("write_sensu plugin: Unable to alloc memory");
- free(sensu_tags);
- return -1;
- }
- if ((val = strdup(child->values[1].value.string)) == NULL) {
- free(sensu_tags);
- free(key);
- ERROR("write_sensu plugin: Unable to alloc memory");
- return -1;
+ continue;
}
- strarray_add(&sensu_attrs, &sensu_attrs_num, key);
- strarray_add(&sensu_attrs, &sensu_attrs_num, val);
- DEBUG("write_sensu: got attr: %s => %s", key, val);
- sfree(key);
- sfree(val);
+
+ strarray_add(&sensu_attrs, &sensu_attrs_num, child->values[0].value.string);
+ strarray_add(&sensu_attrs, &sensu_attrs_num, child->values[1].value.string);
+
+ DEBUG("write_sensu plugin: New attribute: %s => %s",
+ child->values[0].value.string,
+ child->values[1].value.string);
} else if (strcasecmp(child->key, "tag") == 0) {
char *tmp = NULL;
status = cf_util_get_string(child, &tmp);
}
}
if (sensu_tags_arr.nb_strs > 0) {
- free(sensu_tags);
+ sfree (sensu_tags);
sensu_tags = build_json_str_list("tags", &sensu_tags_arr);
free_str_list(&sensu_tags_arr);
if (sensu_tags == NULL) {