From: Pavel Rochnyack Date: Wed, 20 Jun 2018 03:49:46 +0000 (+0700) Subject: core: Introduced daemon_log() for messages prefixed with plugin name X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=bc4f4604ae8a558f2c8c1c40b9fe9649dd9d8266 core: Introduced daemon_log() for messages prefixed with plugin name --- diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c index 9a28ec46..d9038002 100644 --- a/src/daemon/configfile.c +++ b/src/daemon/configfile.c @@ -1041,29 +1041,13 @@ int cf_read(const char *filename) { } /* int cf_read */ -void cf_log(int level, const char *format, ...) { - char msg[1024] = ""; // Size inherits from plugin_log() - - char const *name = plugin_get_ctx().name; - - va_list ap; - va_start(ap, format); - vsnprintf(msg, sizeof(msg), format, ap); - va_end(ap); - - plugin_log(level, "%s plugin: %s", name, msg); -} /* void cf_log */ - -#define CF_ERROR(...) cf_log(LOG_ERR, __VA_ARGS__) -#define CF_WARNING(...) cf_log(LOG_WARNING, __VA_ARGS__) - /* Assures the config option is a string, duplicates it and returns the copy in * "ret_string". If necessary "*ret_string" is freed first. Returns zero upon * success. */ int cf_util_get_string(const oconfig_item_t *ci, char **ret_string) /* {{{ */ { if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { - CF_ERROR("The `%s' option requires exactly one string argument.", ci->key); + P_ERROR("The `%s' option requires exactly one string argument.", ci->key); return -1; } @@ -1086,7 +1070,7 @@ int cf_util_get_string_buffer(const oconfig_item_t *ci, char *buffer, /* {{{ */ return EINVAL; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { - CF_ERROR("The `%s' option requires exactly one string argument.", ci->key); + P_ERROR("The `%s' option requires exactly one string argument.", ci->key); return -1; } @@ -1103,7 +1087,7 @@ int cf_util_get_int(const oconfig_item_t *ci, int *ret_value) /* {{{ */ return EINVAL; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) { - CF_ERROR("The `%s' option requires exactly one numeric argument.", ci->key); + P_ERROR("The `%s' option requires exactly one numeric argument.", ci->key); return -1; } @@ -1118,7 +1102,7 @@ int cf_util_get_double(const oconfig_item_t *ci, double *ret_value) /* {{{ */ return EINVAL; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) { - CF_ERROR("The `%s' option requires exactly one numeric argument.", ci->key); + P_ERROR("The `%s' option requires exactly one numeric argument.", ci->key); return -1; } @@ -1134,7 +1118,7 @@ int cf_util_get_boolean(const oconfig_item_t *ci, bool *ret_bool) /* {{{ */ if ((ci->values_num != 1) || ((ci->values[0].type != OCONFIG_TYPE_BOOLEAN) && (ci->values[0].type != OCONFIG_TYPE_STRING))) { - CF_ERROR("The `%s' option requires exactly one boolean argument.", ci->key); + P_ERROR("The `%s' option requires exactly one boolean argument.", ci->key); return -1; } @@ -1143,19 +1127,19 @@ int cf_util_get_boolean(const oconfig_item_t *ci, bool *ret_bool) /* {{{ */ *ret_bool = ci->values[0].value.boolean ? true : false; break; case OCONFIG_TYPE_STRING: - CF_WARNING("Using string value `%s' for boolean option `%s' is deprecated " - "and will be removed in future releases. Use unquoted true or " - "false instead.", - ci->values[0].value.string, ci->key); + P_WARNING("Using string value `%s' for boolean option `%s' is deprecated " + "and will be removed in future releases. Use unquoted true or " + "false instead.", + ci->values[0].value.string, ci->key); if (IS_TRUE(ci->values[0].value.string)) *ret_bool = true; else if (IS_FALSE(ci->values[0].value.string)) *ret_bool = false; else { - CF_ERROR("Cannot parse string value `%s' of the `%s' option as a boolean " - "value.", - ci->values[0].value.string, ci->key); + P_ERROR("Cannot parse string value `%s' of the `%s' option as a boolean " + "value.", + ci->values[0].value.string, ci->key); return -1; } break; @@ -1196,7 +1180,7 @@ int cf_util_get_port_number(const oconfig_item_t *ci) /* {{{ */ if ((ci->values_num != 1) || ((ci->values[0].type != OCONFIG_TYPE_STRING) && (ci->values[0].type != OCONFIG_TYPE_NUMBER))) { - CF_ERROR("The `%s' option requires exactly one string argument.", ci->key); + P_ERROR("The `%s' option requires exactly one string argument.", ci->key); return -1; } @@ -1206,9 +1190,9 @@ int cf_util_get_port_number(const oconfig_item_t *ci) /* {{{ */ assert(ci->values[0].type == OCONFIG_TYPE_NUMBER); tmp = (int)(ci->values[0].value.number + 0.5); if ((tmp < 1) || (tmp > 65535)) { - CF_ERROR("The `%s' option requires a service name or a port number. The " - "number you specified, %i, is not in the valid range of 1-65535.", - ci->key, tmp); + P_ERROR("The `%s' option requires a service name or a port number. The " + "number you specified, %i, is not in the valid range of 1-65535.", + ci->key, tmp); return -1; } @@ -1222,15 +1206,15 @@ int cf_util_get_service(const oconfig_item_t *ci, char **ret_string) /* {{{ */ int status; if (ci->values_num != 1) { - CF_ERROR("The `%s` option requires exactly one argument.", ci->key); + P_ERROR("The `%s` option requires exactly one argument.", ci->key); return -1; } if (ci->values[0].type == OCONFIG_TYPE_STRING) return cf_util_get_string(ci, ret_string); if (ci->values[0].type != OCONFIG_TYPE_NUMBER) { - CF_ERROR("The `%s` option requires exactly one string or numeric argument.", - ci->key); + P_ERROR("The `%s` option requires exactly one string or numeric argument.", + ci->key); } port = 0; @@ -1238,14 +1222,14 @@ int cf_util_get_service(const oconfig_item_t *ci, char **ret_string) /* {{{ */ if (status != 0) return status; else if ((port < 1) || (port > 65535)) { - CF_ERROR("The port number given for the `%s` option is out of range (%i).", - ci->key, port); + P_ERROR("The port number given for the `%s` option is out of range (%i).", + ci->key, port); return -1; } service = malloc(6); if (service == NULL) { - CF_ERROR("cf_util_get_service: Out of memory."); + P_ERROR("cf_util_get_service: Out of memory."); return -1; } snprintf(service, 6, "%i", port); @@ -1262,13 +1246,13 @@ int cf_util_get_cdtime(const oconfig_item_t *ci, cdtime_t *ret_value) /* {{{ */ return EINVAL; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) { - CF_ERROR("The `%s' option requires exactly one numeric argument.", ci->key); + P_ERROR("The `%s' option requires exactly one numeric argument.", ci->key); return -1; } if (ci->values[0].value.number < 0.0) { - CF_ERROR("The numeric argument of the `%s' option must not be negative.", - ci->key); + P_ERROR("The numeric argument of the `%s' option must not be negative.", + ci->key); return -1; } diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c index 358ee05d..92e1ab26 100644 --- a/src/daemon/plugin.c +++ b/src/daemon/plugin.c @@ -2244,6 +2244,21 @@ void plugin_log(int level, const char *format, ...) { } } /* void plugin_log */ +void daemon_log(int level, const char *format, ...) { + char msg[1024] = ""; // Size inherits from plugin_log() + + char const *name = plugin_get_ctx().name; + if (name == NULL) + name = "UNKNOWN"; + + va_list ap; + va_start(ap, format); + vsnprintf(msg, sizeof(msg), format, ap); + va_end(ap); + + plugin_log(level, "%s plugin: %s", name, msg); +} /* void daemon_log */ + int parse_log_severity(const char *severity) { int log_level = -1; diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h index 024e5384..3c791a1b 100644 --- a/src/daemon/plugin.h +++ b/src/daemon/plugin.h @@ -399,6 +399,15 @@ int parse_notif_severity(const char *severity); #define DEBUG(...) /* noop */ #endif /* ! COLLECT_DEBUG */ +/* These will log messages, prefixed by plugin name */ +void daemon_log(int level, const char *format, ...) + __attribute__((format(printf, 2, 3))); + +#define P_ERROR(...) daemon_log(LOG_ERR, __VA_ARGS__) +#define P_WARNING(...) daemon_log(LOG_WARNING, __VA_ARGS__) +#define P_NOTICE(...) daemon_log(LOG_NOTICE, __VA_ARGS__) +#define P_INFO(...) daemon_log(LOG_INFO, __VA_ARGS__) + const data_set_t *plugin_get_ds(const char *name); int plugin_notification_meta_add_string(notification_t *n, const char *name,