Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix return value or loglevel for several plugins #3182

Merged
merged 4 commits into from Jun 28, 2019
Merged

Fix return value or loglevel for several plugins #3182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42a30ef
be more verbose when plugin config cb is failing
Jun 19, 2019
a07f44c
Fix return value or loglevel for several plugins
Jun 19, 2019
d75591c
better user feedback
Jun 28, 2019
4af2afc
clang-format
Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/barometer.c
View file
Open in desktop
Expand Up @@ -1309,8 +1309,8 @@ static int collectd_barometer_config(const char *key, const char *value) {
} else if (strcasecmp(key, "Normalization") == 0) {
int normalize_tmp = atoi(value);
if (normalize_tmp < 0 || normalize_tmp > 2) {
WARNING("barometer: collectd_barometer_config: invalid normalization: %d",
normalize_tmp);
ERROR("barometer: collectd_barometer_config: invalid normalization: %d",
normalize_tmp);
return 1;
}
config_normalize = normalize_tmp;
Expand Down
24 changes: 14 additions & 10 deletions src/daemon/configfile.c
View file
Open in desktop
Expand Up @@ -267,7 +267,8 @@ static int dispatch_loadplugin(oconfig_item_t *ci) {

/* default to the global interval set before loading this plugin */
plugin_ctx_t ctx = {
.interval = cf_get_default_interval(), .name = strdup(name),
.interval = cf_get_default_interval(),
.name = strdup(name),
};
if (ctx.name == NULL)
return ENOMEM;
Expand Down Expand Up @@ -413,9 +414,13 @@ static int dispatch_block_plugin(oconfig_item_t *ci) {
/* Hm, no complex plugin found. Dispatch the values one by one */
for (int i = 0, ret = 0; i < ci->children_num; i++) {
if (ci->children[i].children == NULL) {
ret = dispatch_value_plugin(name, ci->children + i);
if (ret != 0)
oconfig_item_t *child = ci->children + i;
ret = dispatch_value_plugin(name, child);
if (ret != 0) {
ERROR("Plugin %s failed to handle option %s, return code: %i", name,
child->key, ret);
return ret;
}
} else {
WARNING("There is a `%s' block within the "
"configuration for the %s plugin. "
Expand Down Expand Up @@ -475,9 +480,9 @@ static int cf_ci_replace_child(oconfig_item_t *dst, oconfig_item_t *src,
return 0;
}

temp = realloc(dst->children,
sizeof(oconfig_item_t) *
(dst->children_num + src->children_num - 1));
temp =
realloc(dst->children, sizeof(oconfig_item_t) *
(dst->children_num + src->children_num - 1));
if (temp == NULL) {
ERROR("configfile: realloc failed.");
return -1;
Expand Down Expand Up @@ -516,9 +521,8 @@ static int cf_ci_append_children(oconfig_item_t *dst, oconfig_item_t *src) {
if ((src == NULL) || (src->children_num == 0))
return 0;

temp =
realloc(dst->children,
sizeof(oconfig_item_t) * (dst->children_num + src->children_num));
temp = realloc(dst->children, sizeof(oconfig_item_t) *
(dst->children_num + src->children_num));
if (temp == NULL) {
ERROR("configfile: realloc failed.");
return -1;
Expand Down Expand Up @@ -806,7 +810,7 @@ static oconfig_item_t *cf_read_generic(const char *path, const char *pattern,

return root;
} /* oconfig_item_t *cf_read_generic */
/* #endif HAVE_WORDEXP_H */
/* #endif HAVE_WORDEXP_H */

#else /* if !HAVE_WORDEXP_H */
static oconfig_item_t *cf_read_generic(const char *path, const char *pattern,
Expand Down
16 changes: 10 additions & 6 deletions src/load.c
View file
Open in desktop
Expand Up @@ -61,14 +61,16 @@ static const char *config_keys[] = {"ReportRelative"};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);

static int load_config(const char *key, const char *value) {
if (strcasecmp(key, "ReportRelative") == 0)
if (strcasecmp(key, "ReportRelative") == 0) {
#ifdef _SC_NPROCESSORS_ONLN
report_relative_load = IS_TRUE(value);
#else
WARNING("load plugin: The \"ReportRelative\" configuration "
"is not available, because I can't determine the "
"number of CPUS on this system. Sorry.");
#endif
return 0;
}
return -1;
}
static void load_submit(gauge_t snum, gauge_t mnum, gauge_t lnum) {
Expand All @@ -89,7 +91,9 @@ static void load_submit(gauge_t snum, gauge_t mnum, gauge_t lnum) {

value_list_t vl = VALUE_LIST_INIT;
value_t values[] = {
{.gauge = snum}, {.gauge = mnum}, {.gauge = lnum},
{.gauge = snum},
{.gauge = mnum},
{.gauge = lnum},
};

vl.values = values;
Expand All @@ -114,7 +118,7 @@ static int load_read(void) {
else {
WARNING("load: getloadavg failed: %s", STRERRNO);
}
/* #endif HAVE_GETLOADAVG */
/* #endif HAVE_GETLOADAVG */

#elif defined(KERNEL_LINUX)
gauge_t snum, mnum, lnum;
Expand Down Expand Up @@ -149,7 +153,7 @@ static int load_read(void) {
lnum = atof(fields[2]);

load_submit(snum, mnum, lnum);
/* #endif KERNEL_LINUX */
/* #endif KERNEL_LINUX */

#elif HAVE_LIBSTATGRAB
gauge_t snum, mnum, lnum;
Expand All @@ -162,7 +166,7 @@ static int load_read(void) {
mnum = ls->min5;
lnum = ls->min15;
load_submit(snum, mnum, lnum);
/* #endif HAVE_LIBSTATGRAB */
/* #endif HAVE_LIBSTATGRAB */

#elif HAVE_PERFSTAT
gauge_t snum, mnum, lnum;
Expand All @@ -178,7 +182,7 @@ static int load_read(void) {
mnum = (float)cputotal.loadavg[1] / (float)(1 << SBITS);
lnum = (float)cputotal.loadavg[2] / (float)(1 << SBITS);
load_submit(snum, mnum, lnum);
/* #endif HAVE_PERFSTAT */
/* #endif HAVE_PERFSTAT */

#else
#error "No applicable input method."
Expand Down
4 changes: 2 additions & 2 deletions src/logfile.c
View file
Open in desktop
Expand Up @@ -52,8 +52,8 @@ static int logfile_config(const char *key, const char *value) {
log_level = parse_log_severity(value);
if (log_level < 0) {
log_level = LOG_INFO;
ERROR("logfile: invalid loglevel [%s] defaulting to 'info'", value);
return 1;
WARNING("logfile: invalid loglevel [%s] defaulting to 'info'", value);
return 0;
faxm0dem marked this conversation as resolved.
Show resolved Hide resolved
}
} else if (0 == strcasecmp(key, "File")) {
sfree(log_file);
Expand Down
17 changes: 10 additions & 7 deletions src/openvpn.c
View file
Open in desktop
Expand Up @@ -139,7 +139,8 @@ static void iostats_submit(const char *pinst, const char *tinst, derive_t rx,
derive_t tx) {
value_list_t vl = VALUE_LIST_INIT;
value_t values[] = {
{.derive = rx}, {.derive = tx},
{.derive = rx},
{.derive = tx},
};

/* NOTE ON THE NEW NAMING SCHEMA:
Expand All @@ -165,7 +166,8 @@ static void compression_submit(const char *pinst, const char *tinst,
derive_t uncompressed, derive_t compressed) {
value_list_t vl = VALUE_LIST_INIT;
value_t values[] = {
{.derive = uncompressed}, {.derive = compressed},
{.derive = uncompressed},
{.derive = compressed},
};

vl.values = values;
Expand Down Expand Up @@ -502,14 +504,15 @@ static int openvpn_config(const char *key, const char *value) {
/* callback = */ openvpn_read,
/* interval = */ 0,
&(user_data_t){
.data = instance, .free_func = openvpn_free,
.data = instance,
.free_func = openvpn_free,
});

if (status == EINVAL) {
WARNING("openvpn plugin: status filename \"%s\" "
"already used, please choose a "
"different one.",
status_name);
ERROR("openvpn plugin: status filename \"%s\" "
"already used, please choose a "
"different one.",
status_name);
return -1;
}

Expand Down
6 changes: 4 additions & 2 deletions src/syslog.c
View file
Open in desktop
Expand Up @@ -41,7 +41,8 @@ static int log_level = LOG_INFO;
static int notif_severity;

static const char *config_keys[] = {
"LogLevel", "NotifyLevel",
"LogLevel",
"NotifyLevel",
};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);

Expand All @@ -56,7 +57,8 @@ static int sl_config(const char *key, const char *value) {
} else if (strcasecmp(key, "NotifyLevel") == 0) {
notif_severity = parse_notif_severity(value);
if (notif_severity < 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing brackets for if? "Return 1" is outside of if scope.

return 1;
ERROR("syslog: invalid notification severity [%s]", value);
return 1;
}

return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/ted.c
View file
Open in desktop
Expand Up @@ -243,7 +243,7 @@ static int ted_config(const char *key, const char *value) {

tmp = atoi(value);
if (tmp < 0) {
WARNING("ted plugin: Invalid retry count: %i", tmp);
ERROR("ted plugin: Invalid retry count: %i", tmp);
return 1;
}
conf_retries = tmp;
Expand Down