X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fplugin.c;h=b3f00bd655504075b97c5f158b8c45a8c0d20d05;hb=HEAD;hp=ca04ae21efc8745efc62553cda354060ca54390d;hpb=b2d31bc42a7694c671186081ee0cac077a188b99;p=sysdb.git

diff --git a/src/core/plugin.c b/src/core/plugin.c
index ca04ae2..b3f00bd 100644
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -250,9 +250,8 @@ plugin_unregister_by_name(const char *plugin_name)
 
 			assert(cb->cb_ctx);
 
-			sdb_log(SDB_LOG_INFO, "core: Unregistering "
-					"%s callback '%s' (module %s)", type, cb->super.name,
-					cb->cb_ctx->info.plugin_name);
+			sdb_log(SDB_LOG_INFO, "Unregistering %s callback '%s' (module %s)",
+					type, cb->super.name, cb->cb_ctx->info.plugin_name);
 			sdb_object_deref(SDB_OBJ(cb));
 		}
 	}
@@ -267,6 +266,81 @@ plugin_unregister_by_name(const char *plugin_name)
 	/* else: other callbacks still reference it */
 } /* plugin_unregister_by_name */
 
+/*
+ * store writer wrapper for performing database queries:
+ * It wraps another store writer, adding extra logic as needed.
+ */
+
+typedef struct {
+	sdb_object_t super;
+	sdb_store_writer_t *w;
+	sdb_object_t *ud;
+	sdb_query_opts_t opts;
+} query_writer_t;
+#define QUERY_WRITER_INIT(w, ud) { \
+	SDB_OBJECT_INIT, \
+	(w), (ud), \
+	SDB_DEFAULT_QUERY_OPTS \
+}
+#define QUERY_WRITER(obj) ((query_writer_t *)(obj))
+
+static int
+query_store_host(sdb_store_host_t *host, sdb_object_t *user_data)
+{
+	query_writer_t *qw = QUERY_WRITER(user_data);
+	return qw->w->store_host(host, qw->ud);
+} /* query_store_host */
+
+static int
+query_store_service(sdb_store_service_t *service, sdb_object_t *user_data)
+{
+	query_writer_t *qw = QUERY_WRITER(user_data);
+	return qw->w->store_service(service, qw->ud);
+} /* query_store_service */
+
+static int
+query_store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
+{
+	query_writer_t *qw = QUERY_WRITER(user_data);
+	sdb_timeseries_info_t *infos[metric->stores_num];
+	sdb_metric_store_t stores[metric->stores_num];
+
+	const sdb_metric_store_t *orig_stores = metric->stores;
+	int status;
+	size_t i;
+
+	if (! qw->opts.describe_timeseries)
+		/* nothing further to do */
+		return qw->w->store_metric(metric, qw->ud);
+
+	for (i = 0; i < metric->stores_num; i++) {
+		sdb_metric_store_t *s = stores + i;
+		*s = metric->stores[i];
+		infos[i] = sdb_plugin_describe_timeseries(s->type, s->id);
+		s->info = infos[i];
+	}
+
+	metric->stores = stores;
+	status = qw->w->store_metric(metric, qw->ud);
+	metric->stores = orig_stores;
+
+	for (i = 0; i < metric->stores_num; i++)
+		sdb_timeseries_info_destroy(infos[i]);
+	return status;
+} /* query_store_metric */
+
+static int
+query_store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
+{
+	query_writer_t *qw = QUERY_WRITER(user_data);
+	return qw->w->store_attribute(attr, qw->ud);
+} /* query_store_attribute */
+
+static sdb_store_writer_t query_writer = {
+	query_store_host, query_store_service,
+	query_store_metric, query_store_attribute,
+};
+
 /*
  * private types
  */
@@ -293,13 +367,12 @@ ctx_destroy(sdb_object_t *obj)
 	if (ctx->handle) {
 		const char *err;
 
-		sdb_log(SDB_LOG_INFO, "core: Unloading module %s",
-				ctx->info.plugin_name);
+		sdb_log(SDB_LOG_INFO, "Unloading module %s", ctx->info.plugin_name);
 
 		lt_dlerror();
 		lt_dlclose(ctx->handle);
 		if ((err = lt_dlerror()))
-			sdb_log(SDB_LOG_WARNING, "core: Failed to unload module %s: %s",
+			sdb_log(SDB_LOG_WARNING, "Failed to unload module %s: %s",
 					ctx->info.plugin_name, err);
 	}
 
@@ -367,9 +440,9 @@ plugin_init_ok(sdb_object_t *obj, va_list ap)
 	assert(list); assert(type);
 
 	if (sdb_llist_search_by_name(*list, obj->name)) {
-		sdb_log(SDB_LOG_WARNING, "core: %s callback '%s' "
-				"has already been registered. Ignoring newly "
-				"registered version.", type, obj->name);
+		sdb_log(SDB_LOG_WARNING, "%s callback '%s' has already been "
+				"registered. Ignoring newly registered version.",
+				type, obj->name);
 		return 0;
 	}
 	return 1;
@@ -435,9 +508,8 @@ plugin_writer_init(sdb_object_t *obj, va_list ap)
 
 	if ((! impl->store_host) || (! impl->store_service)
 			|| (! impl->store_metric) || (! impl->store_attribute)) {
-		sdb_log(SDB_LOG_ERR, "core: store writer callback '%s' "
-				"does not fully implement the writer interface.",
-				obj->name);
+		sdb_log(SDB_LOG_ERR, "store writer callback '%s' does not fully "
+				"implement the writer interface.", obj->name);
 		return -1;
 	}
 
@@ -481,9 +553,8 @@ plugin_reader_init(sdb_object_t *obj, va_list ap)
 	assert(impl);
 
 	if ((! impl->prepare_query) || (! impl->execute_query)) {
-		sdb_log(SDB_LOG_ERR, "core: store reader callback '%s' "
-				"does not fully implement the reader interface.",
-				obj->name);
+		sdb_log(SDB_LOG_ERR, "store reader callback '%s' does not fully "
+				"implement the reader interface.", obj->name);
 		return -1;
 	}
 
@@ -527,9 +598,8 @@ plugin_ts_fetcher_init(sdb_object_t *obj, va_list ap)
 	assert(impl);
 
 	if ((! impl->describe) || (! impl->fetch)) {
-		sdb_log(SDB_LOG_ERR, "core: timeseries fetcher callback '%s' "
-				"does not fully implement the interface.",
-				obj->name);
+		sdb_log(SDB_LOG_ERR, "timeseries fetcher callback '%s' does not fully "
+				"implement the interface.", obj->name);
 		return -1;
 	}
 
@@ -567,15 +637,14 @@ module_init(const char *name, lt_dlhandle lh, sdb_plugin_info_t *info)
 
 	mod_init = (int (*)(sdb_plugin_info_t *))lt_dlsym(lh, "sdb_module_init");
 	if (! mod_init) {
-		sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': "
+		sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s': "
 				"could not find symbol 'sdb_module_init'", name);
 		return -1;
 	}
 
 	status = mod_init(info);
 	if (status) {
-		sdb_log(SDB_LOG_ERR, "core: Failed to initialize "
-				"module '%s'", name);
+		sdb_log(SDB_LOG_ERR, "Failed to initialize module '%s'", name);
 		plugin_unregister_by_name(name);
 		return -1;
 	}
@@ -617,7 +686,7 @@ module_load(const char *basedir, const char *name,
 
 	if (access(filename, R_OK)) {
 		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s' (%s): %s",
+		sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s' (%s): %s",
 				name, filename, sdb_strerror(errno, errbuf, sizeof(errbuf)));
 		return -1;
 	}
@@ -627,18 +696,18 @@ module_load(const char *basedir, const char *name,
 
 	lh = lt_dlopen(filename);
 	if (! lh) {
-		sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': %s"
+		sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s': %s"
 				"The most common cause for this problem are missing "
 				"dependencies.\n", name, lt_dlerror());
 		return -1;
 	}
 
 	if (ctx_get())
-		sdb_log(SDB_LOG_WARNING, "core: Discarding old plugin context");
+		sdb_log(SDB_LOG_WARNING, "Discarding old plugin context");
 
 	ctx = ctx_create(name);
 	if (! ctx) {
-		sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin context");
+		sdb_log(SDB_LOG_ERR, "Failed to initialize plugin context");
 		return -1;
 	}
 
@@ -651,26 +720,26 @@ module_load(const char *basedir, const char *name,
 
 	if ((status = module_init(name, lh, &ctx->info))) {
 		sdb_object_deref(SDB_OBJ(ctx));
+		ctx_set(NULL);
 		return status;
 	}
 
 	/* compare minor version */
 	if ((ctx->info.version < 0)
 			|| ((int)(ctx->info.version / 100) != (int)(SDB_VERSION / 100)))
-		sdb_log(SDB_LOG_WARNING, "core: WARNING: version of "
-				"plugin '%s' (%i.%i.%i) does not match our version "
-				"(%i.%i.%i); this might cause problems",
-				name, SDB_VERSION_DECODE(ctx->info.version),
+		sdb_log(SDB_LOG_WARNING, "WARNING: plugin version (%i.%i.%i) "
+				"does not match core version (%i.%i.%i); "
+				"this might cause problems",
+				SDB_VERSION_DECODE(ctx->info.version),
 				SDB_VERSION_DECODE(SDB_VERSION));
 
 	sdb_llist_append(all_plugins, SDB_OBJ(ctx));
 
-	sdb_log(SDB_LOG_INFO, "core: Successfully loaded "
-			"plugin %s v%i (%s)", ctx->info.plugin_name,
-			ctx->info.plugin_version,
+	/* log messages will be prefixed by the plugin name */
+	sdb_log(SDB_LOG_INFO, "Successfully loaded "
+			"version %i (%s)", ctx->info.plugin_version,
 			INFO_GET(&ctx->info, description));
-	sdb_log(SDB_LOG_INFO, "core: Plugin %s: %s, License: %s",
-			ctx->info.plugin_name,
+	sdb_log(SDB_LOG_INFO, "%s, License: %s",
 			INFO_GET(&ctx->info, copyright),
 			INFO_GET(&ctx->info, license));
 
@@ -722,8 +791,7 @@ plugin_add_impl(sdb_llist_t **list, sdb_type_t T, const char *type,
 	/* pass control to the list */
 	sdb_object_deref(obj);
 
-	sdb_log(SDB_LOG_INFO, "core: Registered %s callback '%s'.",
-			type, name);
+	sdb_log(SDB_LOG_INFO, "Registered %s callback '%s'.", type, name);
 	return 0;
 } /* plugin_add_impl */
 
@@ -808,7 +876,7 @@ get_interval(int obj_type, const char *hostname,
 	fetch.name = n;
 
 	status = sdb_plugin_query(SDB_AST_NODE(&fetch),
-			&interval_fetcher, SDB_OBJ(&obj), NULL);
+			&interval_fetcher, SDB_OBJ(&obj), NULL, NULL);
 	if ((status < 0) || (lu.obj_type != obj_type) || (lu.last_update == 0)) {
 		*interval_out = 0;
 		return 0;
@@ -816,7 +884,7 @@ get_interval(int obj_type, const char *hostname,
 
 	if (lu.last_update >= last_update) {
 		if (lu.last_update > last_update)
-			sdb_log(SDB_LOG_DEBUG, "memstore: Cannot update %s '%s' - "
+			sdb_log(SDB_LOG_DEBUG, "Cannot update %s '%s' - "
 					"value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
 					SDB_STORE_TYPE_TO_NAME(obj_type), name,
 					lu.last_update, last_update);
@@ -864,7 +932,7 @@ sdb_plugin_load(const char *basedir, const char *name,
 
 	if (! all_plugins) {
 		if (! (all_plugins = sdb_llist_create())) {
-			sdb_log(SDB_LOG_ERR, "core: Failed to load plugin '%s': "
+			sdb_log(SDB_LOG_ERR, "Failed to load plugin '%s': "
 					"internal error while creating linked list", name);
 			return -1;
 		}
@@ -878,13 +946,14 @@ sdb_plugin_load(const char *basedir, const char *name,
 			ctx_t *old_ctx = ctx_set(ctx);
 
 			status = module_init(ctx->info.plugin_name, ctx->handle, NULL);
+			ctx_set(old_ctx);
 			if (status)
 				return status;
 
-			sdb_log(SDB_LOG_INFO, "core: Successfully reloaded plugin "
+			ctx_set(old_ctx);
+			sdb_log(SDB_LOG_INFO, "Successfully reloaded plugin "
 					"'%s' (%s)", ctx->info.plugin_name,
 					INFO_GET(&ctx->info, description));
-			ctx_set(old_ctx);
 		}
 		++ctx->use_cnt;
 		return 0;
@@ -958,7 +1027,7 @@ sdb_plugin_register_config(sdb_plugin_config_cb callback)
 	ctx_t *ctx = ctx_get();
 
 	if (! ctx) {
-		sdb_log(SDB_LOG_ERR, "core: Invalid attempt to register a "
+		sdb_log(SDB_LOG_ERR, "Invalid attempt to register a "
 				"config callback from outside a plugin");
 		return -1;
 	}
@@ -1034,9 +1103,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
 		ctx_t *ctx = ctx_get();
 
 		if (! ctx) {
-			sdb_log(SDB_LOG_ERR, "core: Cannot determine interval "
-					"for collector %s; none specified and no plugin "
-					"context found", cb_name);
+			sdb_log(SDB_LOG_ERR, "Cannot determine interval for collector %s; "
+					"none specified and no plugin context found", cb_name);
 			return -1;
 		}
 
@@ -1045,8 +1113,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
 
 	if (! (CCB(obj)->ccb_next_update = sdb_gettime())) {
 		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
-				"time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+		sdb_log(SDB_LOG_ERR, "Failed to determine current time: %s",
+				sdb_strerror(errno, errbuf, sizeof(errbuf)));
 		sdb_object_deref(obj);
 		return -1;
 	}
@@ -1060,7 +1128,7 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
 	/* pass control to the list */
 	sdb_object_deref(obj);
 
-	sdb_log(SDB_LOG_INFO, "core: Registered collector callback '%s' "
+	sdb_log(SDB_LOG_INFO, "Registered collector callback '%s' "
 			"(interval = %.3fs).", cb_name,
 			SDB_TIME_TO_DOUBLE(CCB(obj)->ccb_interval));
 	return 0;
@@ -1109,7 +1177,7 @@ sdb_plugin_unregister_all(void)
 			continue;
 
 		sdb_llist_clear(list);
-		sdb_log(SDB_LOG_INFO, "core: Unregistered %zu %s callback%s",
+		sdb_log(SDB_LOG_INFO, "Unregistered %zu %s callback%s",
 				len, type, len == 1 ? "" : "s");
 	}
 } /* sdb_plugin_unregister_all */
@@ -1121,7 +1189,7 @@ sdb_plugin_get_ctx(void)
 
 	c = ctx_get();
 	if (! c) {
-		sdb_plugin_log(SDB_LOG_ERR, "core: Invalid read access to plugin "
+		sdb_log(SDB_LOG_ERR, "Invalid read access to plugin "
 				"context outside a plugin");
 		return plugin_default_ctx;
 	}
@@ -1135,7 +1203,7 @@ sdb_plugin_set_ctx(sdb_plugin_ctx_t ctx, sdb_plugin_ctx_t *old)
 
 	c = ctx_get();
 	if (! c) {
-		sdb_plugin_log(SDB_LOG_ERR, "core: Invalid write access to plugin "
+		sdb_log(SDB_LOG_ERR, "Invalid write access to plugin "
 				"context outside a plugin");
 		return -1;
 	}
@@ -1173,11 +1241,11 @@ sdb_plugin_configure(const char *name, oconfig_item_t *ci)
 	if (! plugin) {
 		ctx_t *ctx = CTX(sdb_llist_search_by_name(all_plugins, name));
 		if (! ctx)
-			sdb_log(SDB_LOG_ERR, "core: Cannot configure unknown "
-					"plugin '%s'. Missing 'LoadPlugin \"%s\"'?",
+			sdb_log(SDB_LOG_ERR, "Cannot configure unknown plugin '%s'. "
+					"Missing 'LoadPlugin \"%s\"'?",
 					name, name);
 		else
-			sdb_log(SDB_LOG_ERR, "core: Plugin '%s' did not register "
+			sdb_log(SDB_LOG_ERR, "Plugin '%s' did not register "
 					"a config callback.", name);
 		errno = ENOENT;
 		return -1;
@@ -1240,7 +1308,7 @@ sdb_plugin_reconfigure_finish(void)
 		if (ctx->use_cnt)
 			continue;
 
-		sdb_log(SDB_LOG_INFO, "core: Module %s no longer in use",
+		sdb_log(SDB_LOG_INFO, "Module %s no longer in use",
 				ctx->info.plugin_name);
 		sdb_llist_iter_remove_current(iter);
 		plugin_unregister_by_name(ctx->info.plugin_name);
@@ -1270,8 +1338,8 @@ sdb_plugin_init_all(void)
 
 		old_ctx = ctx_set(cb->cb_ctx);
 		if (callback(cb->cb_user_data)) {
-			sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin "
-					"'%s'. Unregistering all callbacks.", obj->name);
+			sdb_log(SDB_LOG_ERR, "Failed to initialize plugin '%s'. "
+					"Unregistering all callbacks.", obj->name);
 			ctx_set(old_ctx);
 			plugin_unregister_by_name(cb->cb_ctx->info.plugin_name);
 			++ret;
@@ -1303,7 +1371,7 @@ sdb_plugin_shutdown_all(void)
 
 		old_ctx = ctx_set(cb->cb_ctx);
 		if (callback(cb->cb_user_data)) {
-			sdb_log(SDB_LOG_ERR, "core: Failed to shutdown plugin '%s'.",
+			sdb_log(SDB_LOG_ERR, "Failed to shutdown plugin '%s'.",
 					obj->name);
 			++ret;
 		}
@@ -1317,7 +1385,7 @@ int
 sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 {
 	if (! collector_list) {
-		sdb_log(SDB_LOG_WARNING, "core: No collectors registered. "
+		sdb_log(SDB_LOG_WARNING, "No collectors registered. "
 				"Quiting main loop.");
 		return -1;
 	}
@@ -1339,7 +1407,7 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 
 		if (! (now = sdb_gettime())) {
 			char errbuf[1024];
-			sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
+			sdb_log(SDB_LOG_ERR, "Failed to determine current "
 					"time in collector main loop: %s",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
 			now = CCB(obj)->ccb_next_update;
@@ -1352,7 +1420,7 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 			while (loop->do_loop && sdb_sleep(interval, &interval)) {
 				if (errno != EINTR) {
 					char errbuf[1024];
-					sdb_log(SDB_LOG_ERR, "core: Failed to sleep "
+					sdb_log(SDB_LOG_ERR, "Failed to sleep "
 							"in collector main loop: %s",
 							sdb_strerror(errno, errbuf, sizeof(errbuf)));
 					sdb_llist_insert_sorted(collector_list, obj,
@@ -1382,7 +1450,7 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 		if (! interval)
 			interval = loop->default_interval;
 		if (! interval) {
-			sdb_log(SDB_LOG_WARNING, "core: No interval configured "
+			sdb_log(SDB_LOG_WARNING, "No interval configured "
 					"for plugin '%s'; skipping any further "
 					"iterations.", obj->name);
 			sdb_object_deref(obj);
@@ -1393,14 +1461,14 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 
 		if (! (now = sdb_gettime())) {
 			char errbuf[1024];
-			sdb_log(SDB_LOG_ERR, "core: Failed to determine current "
+			sdb_log(SDB_LOG_ERR, "Failed to determine current "
 					"time in collector main loop: %s",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
 			now = CCB(obj)->ccb_next_update;
 		}
 
 		if (now > CCB(obj)->ccb_next_update) {
-			sdb_log(SDB_LOG_WARNING, "core: Plugin '%s' took too "
+			sdb_log(SDB_LOG_WARNING, "Plugin '%s' took too "
 					"long; skipping iterations to keep up.",
 					obj->name);
 			CCB(obj)->ccb_next_update = now;
@@ -1408,9 +1476,8 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 
 		if (sdb_llist_insert_sorted(collector_list, obj,
 					plugin_cmp_next_update)) {
-			sdb_log(SDB_LOG_ERR, "core: Failed to re-insert "
-					"plugin '%s' into collector list. Unable to further "
-					"use the plugin.",
+			sdb_log(SDB_LOG_ERR, "Failed to re-insert plugin '%s' into "
+					"collector list. Unable to further use the plugin.",
 					obj->name);
 			sdb_object_deref(obj);
 			return -1;
@@ -1456,35 +1523,50 @@ sdb_plugin_cname(char *hostname)
 int
 sdb_plugin_log(int prio, const char *msg)
 {
-	sdb_llist_iter_t *iter;
+	const sdb_plugin_info_t *info;
 	int ret = -1;
 
-	bool logged = 0;
-
 	if (! msg)
 		return 0;
 
-	iter = sdb_llist_get_iter(log_list);
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_plugin_log_cb callback;
-		int tmp;
+	info = sdb_plugin_current();
 
-		sdb_object_t *obj = sdb_llist_iter_get_next(iter);
-		assert(obj);
+	{
+		const char *plugin_name = info ? info->plugin_name : "";
+		char log_msg[strlen(msg) + strlen(plugin_name) + strlen(" plugin: ") + 1];
 
-		callback = (sdb_plugin_log_cb)CB(obj)->cb_callback;
-		tmp = callback(prio, msg, CB(obj)->cb_user_data);
-		if (tmp > ret)
-			ret = tmp;
+		sdb_llist_iter_t *iter;
+		bool logged = 0;
 
-		if (CB(obj)->cb_ctx)
-			logged = 1;
-		/* else: this is an internally registered callback */
-	}
-	sdb_llist_iter_destroy(iter);
+		if (*plugin_name)
+			snprintf(log_msg, sizeof(log_msg), "%s plugin: %s",
+					plugin_name, msg);
+		else
+			strncpy(log_msg, msg, sizeof(log_msg));
+
+		iter = sdb_llist_get_iter(log_list);
+		while (sdb_llist_iter_has_next(iter)) {
+			sdb_plugin_log_cb callback;
+			int tmp;
+
+			sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+			assert(obj);
+
+			callback = (sdb_plugin_log_cb)CB(obj)->cb_callback;
+			tmp = callback(prio, msg, CB(obj)->cb_user_data);
+			if (tmp > ret)
+				ret = tmp;
 
-	if (! logged)
-		return fprintf(stderr, "[%s] %s\n", SDB_LOG_PRIO_TO_STRING(prio), msg);
+			if (CB(obj)->cb_ctx)
+				logged = 1;
+			/* else: this is an internally registered callback */
+		}
+		sdb_llist_iter_destroy(iter);
+
+		if (! logged)
+			return fprintf(stderr, "[%s] %s\n",
+					SDB_LOG_PRIO_TO_STRING(prio), log_msg);
+	}
 	return ret;
 } /* sdb_plugin_log */
 
@@ -1543,7 +1625,7 @@ sdb_plugin_fetch_timeseries(const char *type, const char *id,
 
 	fetcher = TS_FETCHER(sdb_llist_search_by_name(timeseries_fetcher_list, type));
 	if (! fetcher) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot fetch time-series of type %s: "
+		sdb_log(SDB_LOG_ERR, "Cannot fetch time-series of type %s: "
 				"no such plugin loaded", type);
 		errno = ENOENT;
 		return NULL;
@@ -1568,7 +1650,7 @@ sdb_plugin_describe_timeseries(const char *type, const char *id)
 
 	fetcher = TS_FETCHER(sdb_llist_search_by_name(timeseries_fetcher_list, type));
 	if (! fetcher) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot describe time-series of type %s: "
+		sdb_log(SDB_LOG_ERR, "Cannot describe time-series of type %s: "
 				"no such plugin loaded", type);
 		errno = ENOENT;
 		return NULL;
@@ -1582,20 +1664,26 @@ sdb_plugin_describe_timeseries(const char *type, const char *id)
 
 int
 sdb_plugin_query(sdb_ast_node_t *ast,
-		sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
+		sdb_store_writer_t *w, sdb_object_t *wd,
+		sdb_query_opts_t *opts, sdb_strbuf_t *errbuf)
 {
-	size_t n = sdb_llist_len(reader_list);
+	query_writer_t qw = QUERY_WRITER_INIT(w, wd);
 	reader_t *reader;
 	sdb_object_t *q;
+
+	size_t n = sdb_llist_len(reader_list);
 	int status = 0;
 
 	if (! ast)
 		return 0;
 
+	if (opts)
+		qw.opts = *opts;
+
 	if ((ast->type != SDB_AST_TYPE_FETCH)
 			&& (ast->type != SDB_AST_TYPE_LIST)
 			&& (ast->type != SDB_AST_TYPE_LOOKUP)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot execute query of type %s",
+		sdb_log(SDB_LOG_ERR, "Cannot execute query of type %s",
 				SDB_AST_TYPE_TO_STRING(ast));
 		sdb_strbuf_sprintf(errbuf, "Cannot execute query of type %s",
 				SDB_AST_TYPE_TO_STRING(ast));
@@ -1607,7 +1695,7 @@ sdb_plugin_query(sdb_ast_node_t *ast,
 			? "Cannot execute query: multiple readers not supported"
 			: "Cannot execute query: no readers registered";
 		sdb_strbuf_sprintf(errbuf, "%s", msg);
-		sdb_log(SDB_LOG_ERR, "core: %s", msg);
+		sdb_log(SDB_LOG_ERR, "%s", msg);
 		return -1;
 	}
 
@@ -1616,7 +1704,7 @@ sdb_plugin_query(sdb_ast_node_t *ast,
 
 	q = reader->impl.prepare_query(ast, errbuf, reader->r_user_data);
 	if (q)
-		status = reader->impl.execute_query(q, w, SDB_OBJ(wd),
+		status = reader->impl.execute_query(q, &query_writer, SDB_OBJ(&qw),
 				errbuf, reader->r_user_data);
 	else
 		status = -1;
@@ -1640,14 +1728,13 @@ sdb_plugin_store_host(const char *name, sdb_time_t last_update)
 		return -1;
 
 	if (! sdb_llist_len(writer_list)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot store host: "
-				"no writers registered");
+		sdb_log(SDB_LOG_ERR, "Cannot store host: no writers registered");
 		return -1;
 	}
 
 	cname = sdb_plugin_cname(strdup(name));
 	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "core: strdup failed");
+		sdb_log(SDB_LOG_ERR, "strdup failed");
 		return -1;
 	}
 
@@ -1692,14 +1779,14 @@ sdb_plugin_store_service(const char *hostname, const char *name,
 		return -1;
 
 	if (! sdb_llist_len(writer_list)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot store service: "
+		sdb_log(SDB_LOG_ERR, "Cannot store service: "
 				"no writers registered");
 		return -1;
 	}
 
 	cname = sdb_plugin_cname(strdup(hostname));
 	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "core: strdup failed");
+		sdb_log(SDB_LOG_ERR, "strdup failed");
 		return -1;
 	}
 
@@ -1755,14 +1842,13 @@ sdb_plugin_store_metric(const char *hostname, const char *name,
 		return -1;
 
 	if (! sdb_llist_len(writer_list)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot store metric: "
-				"no writers registered");
+		sdb_log(SDB_LOG_ERR, "Cannot store metric: no writers registered");
 		return -1;
 	}
 
 	cname = sdb_plugin_cname(strdup(hostname));
 	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "core: strdup failed");
+		sdb_log(SDB_LOG_ERR, "strdup failed");
 		return -1;
 	}
 
@@ -1825,14 +1911,13 @@ sdb_plugin_store_attribute(const char *hostname, const char *key,
 		return -1;
 
 	if (! sdb_llist_len(writer_list)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot store attribute: "
-				"no writers registered");
+		sdb_log(SDB_LOG_ERR, "Cannot store attribute: no writers registered");
 		return -1;
 	}
 
 	cname = sdb_plugin_cname(strdup(hostname));
 	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "core: strdup failed");
+		sdb_log(SDB_LOG_ERR, "strdup failed");
 		return -1;
 	}
 
@@ -1878,14 +1963,14 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
 		return -1;
 
 	if (! sdb_llist_len(writer_list)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot store service attribute: "
+		sdb_log(SDB_LOG_ERR, "Cannot store service attribute: "
 				"no writers registered");
 		return -1;
 	}
 
 	cname = sdb_plugin_cname(strdup(hostname));
 	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "core: strdup failed");
+		sdb_log(SDB_LOG_ERR, "strdup failed");
 		return -1;
 	}
 
@@ -1932,14 +2017,14 @@ sdb_plugin_store_metric_attribute(const char *hostname, const char *metric,
 		return -1;
 
 	if (! sdb_llist_len(writer_list)) {
-		sdb_log(SDB_LOG_ERR, "core: Cannot store metric attribute: "
+		sdb_log(SDB_LOG_ERR, "Cannot store metric attribute: "
 				"no writers registered");
 		return -1;
 	}
 
 	cname = sdb_plugin_cname(strdup(hostname));
 	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "core: strdup failed");
+		sdb_log(SDB_LOG_ERR, "strdup failed");
 		return -1;
 	}