projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't fail if syslog loglevel doesn't match
[collectd.git]
/
src
/
varnish.c
diff --git
a/src/varnish.c
b/src/varnish.c
index
b4ae438
..
f4c70af
100644
(file)
--- a/
src/varnish.c
+++ b/
src/varnish.c
@@
-107,8
+107,8
@@
static int varnish_submit(const char *plugin_instance, /* {{{ */
if (plugin_instance == NULL)
plugin_instance = "default";
if (plugin_instance == NULL)
plugin_instance = "default";
- snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
- plugin_instance, category);
+ s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
+
plugin_instance, category);
sstrncpy(vl.type, type, sizeof(vl.type));
sstrncpy(vl.type, type, sizeof(vl.type));
@@
-1546,7
+1546,8
@@
static int varnish_init(void) /* {{{ */
/* callback = */ varnish_read,
/* interval = */ 0,
&(user_data_t){
/* callback = */ varnish_read,
/* interval = */ 0,
&(user_data_t){
- .data = conf, .free_func = varnish_config_free,
+ .data = conf,
+ .free_func = varnish_config_free,
});
return 0;
});
return 0;
@@
-1751,7
+1752,7
@@
static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */
!conf->collect_mgt && !conf->collect_lck && !conf->collect_mempool &&
!conf->collect_mse
#endif
!conf->collect_mgt && !conf->collect_lck && !conf->collect_mempool &&
!conf->collect_mse
#endif
-
) {
+ ) {
WARNING("Varnish plugin: No metric has been configured for "
"instance \"%s\". Disabling this instance.",
(conf->instance == NULL) ? "localhost" : conf->instance);
WARNING("Varnish plugin: No metric has been configured for "
"instance \"%s\". Disabling this instance.",
(conf->instance == NULL) ? "localhost" : conf->instance);
@@
-1759,8
+1760,8
@@
static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */
return EINVAL;
}
return EINVAL;
}
- snprintf(callback_name, sizeof(callback_name), "varnish/%s",
- (conf->instance == NULL) ? "localhost" : conf->instance);
+ s
s
nprintf(callback_name, sizeof(callback_name), "varnish/%s",
+
(conf->instance == NULL) ? "localhost" : conf->instance);
plugin_register_complex_read(
/* group = */ "varnish",
plugin_register_complex_read(
/* group = */ "varnish",
@@
-1768,7
+1769,8
@@
static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */
/* callback = */ varnish_read,
/* interval = */ 0,
&(user_data_t){
/* callback = */ varnish_read,
/* interval = */ 0,
&(user_data_t){
- .data = conf, .free_func = varnish_config_free,
+ .data = conf,
+ .free_func = varnish_config_free,
});
have_instance = true;
});
have_instance = true;