projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testing: Return failure from OK1() and other fixes.
[collectd.git]
/
src
/
write_riemann.c
diff --git
a/src/write_riemann.c
b/src/write_riemann.c
index
93bf853
..
26fa3f4
100644
(file)
--- a/
src/write_riemann.c
+++ b/
src/write_riemann.c
@@
-365,7
+365,7
@@
static Msg *riemann_notification_to_protobuf(struct riemann_host *host, /* {{{ *
char service_buffer[6 * DATA_MAX_NAME_LEN];
char const *severity;
notification_meta_t *meta;
char service_buffer[6 * DATA_MAX_NAME_LEN];
char const *severity;
notification_meta_t *meta;
-
in
t i;
+
size_
t i;
msg = malloc (sizeof (*msg));
if (msg == NULL)
msg = malloc (sizeof (*msg));
if (msg == NULL)
@@
-474,7
+474,7
@@
static Event *riemann_value_to_protobuf(struct riemann_host const *host, /* {{{
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
double ttl;
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
double ttl;
-
in
t i;
+
size_
t i;
event = malloc (sizeof (*event));
if (event == NULL)
event = malloc (sizeof (*event));
if (event == NULL)
@@
-619,7
+619,7
@@
static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /*
msg__init (msg);
/* Set up events. First, the list of pointers. */
msg__init (msg);
/* Set up events. First, the list of pointers. */
- msg->n_events =
(size_t)
vl->values_len;
+ msg->n_events = vl->values_len;
msg->events = calloc (msg->n_events, sizeof (*msg->events));
if (msg->events == NULL)
{
msg->events = calloc (msg->n_events, sizeof (*msg->events));
if (msg->events == NULL)
{
@@
-744,8
+744,8
@@
static int riemann_batch_add_value_list (struct riemann_host *host, /* {{{ */
len = msg__get_packed_size(host->batch_msg);
ret = 0;
len = msg__get_packed_size(host->batch_msg);
ret = 0;
- if (
len >= host->batch_max
) {
- ret = riemann_batch_flush_nolock(0, host);
+ if (
(host->batch_max < 0) || (((size_t) host->batch_max) <= len)
) {
+
ret = riemann_batch_flush_nolock(0, host);
}
pthread_mutex_unlock(&host->lock);
}
pthread_mutex_unlock(&host->lock);
@@
-789,6
+789,8
@@
static int riemann_write(const data_set_t *ds, /* {{{ */
status = write_riemann_threshold_check(ds, vl, statuses);
if (status != 0)
return status;
status = write_riemann_threshold_check(ds, vl, statuses);
if (status != 0)
return status;
+ } else {
+ memset (statuses, 0, sizeof (statuses));
}
if (host->use_tcp == 1 && host->batch_mode) {
}
if (host->use_tcp == 1 && host->batch_mode) {