projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac16c81
)
write_riemann plugin: Coding style fixes.
author
Florian Forster
<octo@collectd.org>
Sun, 12 Jan 2014 08:17:21 +0000
(09:17 +0100)
committer
Florian Forster
<octo@collectd.org>
Sun, 12 Jan 2014 08:17:21 +0000
(09:17 +0100)
src/write_riemann.c
patch
|
blob
|
history
diff --git
a/src/write_riemann.c
b/src/write_riemann.c
index
3a7738f
..
c890818
100644
(file)
--- a/
src/write_riemann.c
+++ b/
src/write_riemann.c
@@
-108,8
+108,7
@@
static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */
} /* }}} void riemann_msg_protobuf_free */
/* host->lock must be held when calling this function. */
} /* }}} void riemann_msg_protobuf_free */
/* host->lock must be held when calling this function. */
-static int
-riemann_connect(struct riemann_host *host)
+static int riemann_connect(struct riemann_host *host) /* {{{ */
{
int e;
struct addrinfo *ai, *res, hints;
{
int e;
struct addrinfo *ai, *res, hints;
@@
-164,11
+163,10
@@
riemann_connect(struct riemann_host *host)
return -1;
}
return 0;
return -1;
}
return 0;
-}
+}
/* }}} int riemann_connect */
/* host->lock must be held when calling this function. */
/* host->lock must be held when calling this function. */
-static int
-riemann_disconnect (struct riemann_host *host)
+static int riemann_disconnect (struct riemann_host *host) /* {{{ */
{
if ((host->flags & F_CONNECT) == 0)
return (0);
{
if ((host->flags & F_CONNECT) == 0)
return (0);
@@
-178,17
+176,15
@@
riemann_disconnect (struct riemann_host *host)
host->flags &= ~F_CONNECT;
return (0);
host->flags &= ~F_CONNECT;
return (0);
-}
+}
/* }}} int riemann_disconnect */
-static inline int
-riemann_send_msg(struct riemann_host *host, const Msg *msg)
+static int riemann_send_msg (struct riemann_host *host, const Msg *msg) /* {{{ */
{
int status = 0;
u_char *buffer = NULL;
size_t buffer_len;
status = riemann_connect (host);
{
int status = 0;
u_char *buffer = NULL;
size_t buffer_len;
status = riemann_connect (host);
-
if (status != 0)
return status;
if (status != 0)
return status;
@@
-198,12
+194,10
@@
riemann_send_msg(struct riemann_host *host, const Msg *msg)
buffer_len += 4;
buffer = malloc (buffer_len);
buffer_len += 4;
buffer = malloc (buffer_len);
-
if (buffer == NULL) {
ERROR ("write_riemann plugin: malloc failed.");
return ENOMEM;
}
if (buffer == NULL) {
ERROR ("write_riemann plugin: malloc failed.");
return ENOMEM;
}
-
memset (buffer, 0, buffer_len);
if (host->use_tcp)
memset (buffer, 0, buffer_len);
if (host->use_tcp)
@@
-218,26
+212,22
@@
riemann_send_msg(struct riemann_host *host, const Msg *msg)
}
status = (int) swrite (host->s, buffer, buffer_len);
}
status = (int) swrite (host->s, buffer, buffer_len);
-
if (status != 0)
{
char errbuf[1024];
if (status != 0)
{
char errbuf[1024];
-
ERROR ("write_riemann plugin: Sending to Riemann at %s:%s failed: %s",
(host->node != NULL) ? host->node : RIEMANN_HOST,
(host->service != NULL) ? host->service : RIEMANN_PORT,
sstrerror (errno, errbuf, sizeof (errbuf)));
ERROR ("write_riemann plugin: Sending to Riemann at %s:%s failed: %s",
(host->node != NULL) ? host->node : RIEMANN_HOST,
(host->service != NULL) ? host->service : RIEMANN_PORT,
sstrerror (errno, errbuf, sizeof (errbuf)));
-
sfree (buffer);
return -1;
}
sfree (buffer);
return 0;
sfree (buffer);
return -1;
}
sfree (buffer);
return 0;
-}
+}
/* }}} int riemann_send_msg */
-static inline int
-riemann_recv_ack(struct riemann_host *host)
+static int riemann_recv_ack(struct riemann_host *host) /* {{{ */
{
int status = 0;
Msg *msg = NULL;
{
int status = 0;
Msg *msg = NULL;
@@
-277,21
+267,19
@@
riemann_recv_ack(struct riemann_host *host)
msg__free_unpacked (msg, NULL);
return 0;
msg__free_unpacked (msg, NULL);
return 0;
-}
+}
/* }}} int riemann_recv_ack */
/**
* Function to send messages (Msg) to riemann.
*
* Acquires the host lock, disconnects on errors.
*/
/**
* Function to send messages (Msg) to riemann.
*
* Acquires the host lock, disconnects on errors.
*/
-static int
-riemann_send(struct riemann_host *host, Msg const *msg)
+static int riemann_send(struct riemann_host *host, Msg const *msg) /* {{{ */
{
int status = 0;
pthread_mutex_lock (&host->lock);
status = riemann_send_msg(host, msg);
{
int status = 0;
pthread_mutex_lock (&host->lock);
status = riemann_send_msg(host, msg);
-
if (status != 0) {
riemann_disconnect (host);
pthread_mutex_unlock (&host->lock);
if (status != 0) {
riemann_disconnect (host);
pthread_mutex_unlock (&host->lock);
@@
-315,7
+303,7
@@
riemann_send(struct riemann_host *host, Msg const *msg)
pthread_mutex_unlock (&host->lock);
return 0;
pthread_mutex_unlock (&host->lock);
return 0;
-}
+}
/* }}} int riemann_send */
static int riemann_event_add_tag (Event *event, char const *tag) /* {{{ */
{
static int riemann_event_add_tag (Event *event, char const *tag) /* {{{ */
{
@@
-620,8
+608,7
@@
static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /*
return (msg);
} /* }}} Msg *riemann_value_list_to_protobuf */
return (msg);
} /* }}} Msg *riemann_value_list_to_protobuf */
-static int
-riemann_notification(const notification_t *n, user_data_t *ud)
+static int riemann_notification(const notification_t *n, user_data_t *ud) /* {{{ */
{
int status;
struct riemann_host *host = ud->data;
{
int status;
struct riemann_host *host = ud->data;
@@
-640,8
+627,7
@@
riemann_notification(const notification_t *n, user_data_t *ud)
return (status);
} /* }}} int riemann_notification */
return (status);
} /* }}} int riemann_notification */
-static int
-riemann_write(const data_set_t *ds,
+static int riemann_write(const data_set_t *ds, /* {{{ */
const value_list_t *vl,
user_data_t *ud)
{
const value_list_t *vl,
user_data_t *ud)
{
@@
-660,10
+646,9
@@
riemann_write(const data_set_t *ds,
riemann_msg_protobuf_free (msg);
return status;
riemann_msg_protobuf_free (msg);
return status;
-}
+}
/* }}} int riemann_write */
-static void
-riemann_free(void *p)
+static void riemann_free(void *p) /* {{{ */
{
struct riemann_host *host = p;
{
struct riemann_host *host = p;
@@
-684,10
+669,9
@@
riemann_free(void *p)
sfree(host->service);
pthread_mutex_destroy (&host->lock);
sfree(host);
sfree(host->service);
pthread_mutex_destroy (&host->lock);
sfree(host);
-}
+}
/* }}} void riemann_free */
-static int
-riemann_config_node(oconfig_item_t *ci)
+static int riemann_config_node(oconfig_item_t *ci) /* {{{ */
{
struct riemann_host *host = NULL;
int status = 0;
{
struct riemann_host *host = NULL;
int status = 0;
@@
-843,10
+827,9
@@
riemann_config_node(oconfig_item_t *ci)
pthread_mutex_unlock (&host->lock);
return status;
pthread_mutex_unlock (&host->lock);
return status;
-}
+}
/* }}} int riemann_config_node */
-static int
-riemann_config(oconfig_item_t *ci)
+static int riemann_config(oconfig_item_t *ci) /* {{{ */
{
int i;
oconfig_item_t *child;
{
int i;
oconfig_item_t *child;
@@
-899,10
+882,9
@@
riemann_config(oconfig_item_t *ci)
}
}
return (0);
}
}
return (0);
-}
+}
/* }}} int riemann_config */
-void
-module_register(void)
+void module_register(void)
{
plugin_register_complex_config ("write_riemann", riemann_config);
}
{
plugin_register_complex_config ("write_riemann", riemann_config);
}