projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #571 from jktjkt/sensors-support-power
[collectd.git]
/
src
/
write_graphite.c
diff --git
a/src/write_graphite.c
b/src/write_graphite.c
index
e49970c
..
d3d5202
100644
(file)
--- a/
src/write_graphite.c
+++ b/
src/write_graphite.c
@@
-49,7
+49,6
@@
#include "utils_cache.h"
#include "utils_complain.h"
#include "utils_cache.h"
#include "utils_complain.h"
-#include "utils_parse_option.h"
#include "utils_format_graphite.h"
/* Folks without pthread will need to disable this plugin. */
#include "utils_format_graphite.h"
/* Folks without pthread will need to disable this plugin. */
@@
-67,7
+66,7
@@
#endif
#ifndef WG_DEFAULT_PROTOCOL
#endif
#ifndef WG_DEFAULT_PROTOCOL
-# define WG_DEFAULT_PROTOCOL "
ud
p"
+# define WG_DEFAULT_PROTOCOL "
tc
p"
#endif
#ifndef WG_DEFAULT_LOG_SEND_ERRORS
#endif
#ifndef WG_DEFAULT_LOG_SEND_ERRORS
@@
-83,6
+82,10
@@
# define WG_SEND_BUF_SIZE 1428
#endif
# define WG_SEND_BUF_SIZE 1428
#endif
+#ifndef WG_MIN_RECONNECT_INTERVAL
+# define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1)
+#endif
+
/*
* Private variables
*/
/*
* Private variables
*/
@@
-109,6
+112,7
@@
struct wg_callback
pthread_mutex_t send_lock;
c_complain_t init_complaint;
pthread_mutex_t send_lock;
c_complain_t init_complaint;
+ cdtime_t last_connect_time;
};
};
@@
-130,11
+134,13
@@
static int wg_send_buffer (struct wg_callback *cb)
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)
{
+ const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
+
if (cb->log_send_errors)
{
char errbuf[1024];
ERROR ("write_graphite plugin: send to %s:%s (%s) failed with status %zi (%s)",
if (cb->log_send_errors)
{
char errbuf[1024];
ERROR ("write_graphite plugin: send to %s:%s (%s) failed with status %zi (%s)",
- cb->node, cb->service,
cb->
protocol,
+ cb->node, cb->service, protocol,
status, sstrerror (errno, errbuf, sizeof (errbuf)));
}
status, sstrerror (errno, errbuf, sizeof (errbuf)));
}
@@
-184,6
+190,7
@@
static int wg_callback_init (struct wg_callback *cb)
struct addrinfo ai_hints;
struct addrinfo *ai_list;
struct addrinfo *ai_ptr;
struct addrinfo ai_hints;
struct addrinfo *ai_list;
struct addrinfo *ai_ptr;
+ cdtime_t now;
int status;
const char *node = cb->node ? cb->node : WG_DEFAULT_NODE;
int status;
const char *node = cb->node ? cb->node : WG_DEFAULT_NODE;
@@
-193,6
+200,13
@@
static int wg_callback_init (struct wg_callback *cb)
if (cb->sock_fd > 0)
return (0);
if (cb->sock_fd > 0)
return (0);
+ /* Don't try to reconnect too often. By default, one reconnection attempt
+ * is made per second. */
+ now = cdtime ();
+ if ((now - cb->last_connect_time) < WG_MIN_RECONNECT_INTERVAL)
+ return (EAGAIN);
+ cb->last_connect_time = now;
+
memset (&ai_hints, 0, sizeof (ai_hints));
#ifdef AI_ADDRCONFIG
ai_hints.ai_flags |= AI_ADDRCONFIG;
memset (&ai_hints, 0, sizeof (ai_hints));
#ifdef AI_ADDRCONFIG
ai_hints.ai_flags |= AI_ADDRCONFIG;