projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ntpd: Check STA_NANO in the server status
[collectd.git]
/
src
/
write_graphite.c
diff --git
a/src/write_graphite.c
b/src/write_graphite.c
index
6baace1
..
0f9a8be
100644
(file)
--- a/
src/write_graphite.c
+++ b/
src/write_graphite.c
@@
-51,9
+51,6
@@
#include "utils_complain.h"
#include "utils_format_graphite.h"
#include "utils_complain.h"
#include "utils_format_graphite.h"
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
#include <netdb.h>
#define WG_DEFAULT_NODE "localhost"
#include <netdb.h>
#define WG_DEFAULT_NODE "localhost"
@@
-138,7
+135,10
@@
static void wg_reset_buffer (struct wg_callback *cb)
static int wg_send_buffer (struct wg_callback *cb)
{
static int wg_send_buffer (struct wg_callback *cb)
{
- ssize_t status = 0;
+ ssize_t status;
+
+ if (cb->sock_fd < 0)
+ return (-1);
status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
if (status != 0)
status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
if (status != 0)
@@
-180,7
+180,7
@@
static int wg_flush_nolock (cdtime_t timeout, struct wg_callback *cb)
return (0);
}
return (0);
}
- if (cb->send_buf_fill
<
= 0)
+ if (cb->send_buf_fill
=
= 0)
{
cb->send_buf_init_time = cdtime ();
return (0);
{
cb->send_buf_init_time = cdtime ();
return (0);
@@
-486,13
+486,12
@@
static int wg_config_node (oconfig_item_t *ci)
int i;
int status = 0;
int i;
int status = 0;
- cb =
malloc (
sizeof (*cb));
+ cb =
calloc (1,
sizeof (*cb));
if (cb == NULL)
{
if (cb == NULL)
{
- ERROR ("write_graphite plugin:
m
alloc failed.");
+ ERROR ("write_graphite plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (cb, 0, sizeof (*cb));
cb->sock_fd = -1;
cb->name = NULL;
cb->node = strdup (WG_DEFAULT_NODE);
cb->sock_fd = -1;
cb->name = NULL;
cb->node = strdup (WG_DEFAULT_NODE);