X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.h;h=8f0c6d86105fbfe56547d6b5d78ac9fd7a7f4b26;hb=21ba59f8197dba0a72dbf5186bc0a5d7e5074496;hp=e147a938c433222a04fd919b60faa62703f95f9b;hpb=d5ba2cb628f0c5c3e5c3eef1c62aacc23f3d8aef;p=collectd.git diff --git a/src/plugin.h b/src/plugin.h index e147a938..8f0c6d86 100644 --- a/src/plugin.h +++ b/src/plugin.h @@ -99,8 +99,7 @@ struct value_list_s }; typedef struct value_list_s value_list_t; -#define VALUE_LIST_INIT { NULL, 0, 0, \ - (plugin_interval > 0) ? plugin_interval : interval_g, \ +#define VALUE_LIST_INIT { NULL, 0, 0, plugin_get_interval (), \ "localhost", "", "", "", "", NULL } #define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "", "", NULL } @@ -224,7 +223,8 @@ void plugin_set_dir (const char *dir); * and a value below zero if an error occurs. * * NOTES - * No attempt is made to re-load an already loaded module. + * Re-loading an already loaded module is detected and zero is returned in + * this case. */ int plugin_load (const char *name, uint32_t flags); @@ -327,8 +327,7 @@ int plugin_unregister_notification (const char *name); * `vl' Value list of the values that have been read by a `read' * function. */ -int plugin_dispatch_values (value_list_t *vl); -int plugin_dispatch_values_secure (const value_list_t *vl); +int plugin_dispatch_values (value_list_t const *vl); int plugin_dispatch_missing (const value_list_t *vl); int plugin_dispatch_notification (const notification_t *notif); @@ -336,6 +335,10 @@ int plugin_dispatch_notification (const notification_t *notif); void plugin_log (int level, const char *format, ...) __attribute__ ((format(printf,2,3))); +/* These functions return the parsed severity or less than zero on failure. */ +int parse_log_severity (const char *severity); +int parse_notif_severity (const char *severity); + #define ERROR(...) plugin_log (LOG_ERR, __VA_ARGS__) #define WARNING(...) plugin_log (LOG_WARNING, __VA_ARGS__) #define NOTICE(...) plugin_log (LOG_NOTICE, __VA_ARGS__)