X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fplugin.c;h=b91672fcfac559e4270a4dc28b05cd93837ac84b;hb=799fe057abbbd81b2d0b3e41fb90dd8e52ba4952;hp=358ee05dd98add5b711e21b9b67479f08ce566e1;hpb=33e39e17215e4fdbf48621e53d69dcd956a3d17f;p=collectd.git diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c index 358ee05d..b91672fc 100644 --- a/src/daemon/plugin.c +++ b/src/daemon/plugin.c @@ -1162,6 +1162,7 @@ int plugin_register_read(const char *name, int (*callback)(void)) { rf->rf_name = strdup(name); rf->rf_type = RF_SIMPLE; rf->rf_interval = plugin_get_interval(); + rf->rf_ctx.interval = rf->rf_interval; status = plugin_insert_read(rf); if (status != 0) { @@ -1203,6 +1204,7 @@ int plugin_register_complex_read(const char *group, const char *name, } rf->rf_ctx = plugin_get_ctx(); + rf->rf_ctx.interval = rf->rf_interval; status = plugin_insert_read(rf); if (status != 0) { @@ -2244,6 +2246,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;