projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.6' into collectd-5.7
[collectd.git]
/
src
/
daemon
/
plugin.c
diff --git
a/src/daemon/plugin.c
b/src/daemon/plugin.c
index
f313f36
..
0f06737
100644
(file)
--- a/
src/daemon/plugin.c
+++ b/
src/daemon/plugin.c
@@
-153,14
+153,13
@@
static const char *plugin_get_dir(void) {
return (plugindir);
}
return (plugindir);
}
-static void plugin_update_internal_statistics(void) { /* {{{ */
-
+static int plugin_update_internal_statistics(void) { /* {{{ */
gauge_t copy_write_queue_length = (gauge_t)write_queue_length;
/* Initialize `vl' */
value_list_t vl = VALUE_LIST_INIT;
gauge_t copy_write_queue_length = (gauge_t)write_queue_length;
/* Initialize `vl' */
value_list_t vl = VALUE_LIST_INIT;
- sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, "collectd", sizeof(vl.plugin));
sstrncpy(vl.plugin, "collectd", sizeof(vl.plugin));
+ vl.interval = plugin_get_interval();
/* Write queue */
sstrncpy(vl.plugin_instance, "write_queue", sizeof(vl.plugin_instance));
/* Write queue */
sstrncpy(vl.plugin_instance, "write_queue", sizeof(vl.plugin_instance));
@@
-189,8
+188,8
@@
static void plugin_update_internal_statistics(void) { /* {{{ */
vl.type_instance[0] = 0;
plugin_dispatch_values(&vl);
vl.type_instance[0] = 0;
plugin_dispatch_values(&vl);
- return;
-} /* }}}
void
plugin_update_internal_statistics */
+ return
0
;
+} /* }}}
int
plugin_update_internal_statistics */
static void destroy_callback(callback_func_t *cf) /* {{{ */
{
static void destroy_callback(callback_func_t *cf) /* {{{ */
{
@@
-1572,8
+1571,10
@@
int plugin_init_all(void) {
/* Init the value cache */
uc_init();
/* Init the value cache */
uc_init();
- if (IS_TRUE(global_option_get("CollectInternalStats")))
+ if (IS_TRUE(global_option_get("CollectInternalStats")))
{
record_statistics = 1;
record_statistics = 1;
+ plugin_register_read("collectd", plugin_update_internal_statistics);
+ }
chain_name = global_option_get("PreCacheChain");
pre_cache_chain = fc_chain_get_by_name(chain_name);
chain_name = global_option_get("PreCacheChain");
pre_cache_chain = fc_chain_get_by_name(chain_name);
@@
-1661,9
+1662,6
@@
int plugin_init_all(void) {
/* TODO: Rename this function. */
void plugin_read_all(void) {
/* TODO: Rename this function. */
void plugin_read_all(void) {
- if (record_statistics) {
- plugin_update_internal_statistics();
- }
uc_check_timeout();
return;
uc_check_timeout();
return;