plugin: Report an error if a collector's interval cannot be determined.

[sysdb.git] / src / core / plugin.c

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 36f80f6e6c29296322fac9979632a0e32ea05f29..919df2b3c982fed934b0495849817936907d9253 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -50,29 +50,14 @@
 
 #include <pthread.h>
 
+/* helper to access info attributes */
+#define INFO_GET(i, attr) \
+       ((i)->attr ? (i)->attr : #attr" not set")
+
 /*
  * private data types
  */
 
-struct sdb_plugin_info {
-       char *plugin_name;
-       char *filename;
-
-       /* public attributes */
-       char *description;
-       char *copyright;
-       char *license;
-
-       int   version;
-       int   plugin_version;
-};
-#define SDB_PLUGIN_INFO_INIT { \
-       /* plugin_name */ NULL, /* filename */ NULL, /* desc */ NULL, \
-       /* copyright */ NULL, /* license */ NULL, \
-       /* version */ -1, /* plugin_version */ -1 }
-#define INFO_GET(i, attr) \
-       ((i)->attr ? (i)->attr : #attr" not set")
-
 typedef struct {
        sdb_object_t super;
        sdb_plugin_ctx_t public;
@@ -766,12 +751,16 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
        if (interval)
                SDB_PLUGIN_CCB(obj)->ccb_interval = *interval;
        else {
-               sdb_time_t tmp = sdb_plugin_get_ctx().interval;
+               ctx_t *ctx = ctx_get();
 
-               if (tmp > 0)
-                       SDB_PLUGIN_CCB(obj)->ccb_interval = tmp;
-               else
-                       SDB_PLUGIN_CCB(obj)->ccb_interval = 0;
+               if (! ctx) {
+                       sdb_log(SDB_LOG_ERR, "core: Cannot determine interval "
+                                       "for collector %s; none specified and no plugin "
+                                       "context found", cb_name);
+                       return -1;
+               }
+
+               SDB_PLUGIN_CCB(obj)->ccb_interval = ctx->public.interval;
        }
 
        if (! (SDB_PLUGIN_CCB(obj)->ccb_next_update = sdb_gettime())) {
@@ -829,6 +818,16 @@ sdb_plugin_set_ctx(sdb_plugin_ctx_t ctx, sdb_plugin_ctx_t *old)
        return 0;
 } /* sdb_plugin_set_ctx */
 
+const sdb_plugin_info_t *
+sdb_plugin_current(void)
+{
+       ctx_t *ctx = ctx_get();
+
+       if (! ctx)
+               return NULL;
+       return &ctx->info;
+} /* sdb_plugin_current */
+
 int
 sdb_plugin_configure(const char *name, oconfig_item_t *ci)
 {