diff --git a/src/core/plugin.c b/src/core/plugin.c
index da77f8e57a637426894a1a425498b0216cd8ff7c..96df9fe6b77fdc89377da0efee47cd159ad6cccb 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
/* else: other callbacks still reference it */
} /* plugin_unregister_by_name */
-static void
-plugin_unregister_all(void)
-{
- size_t i;
-
- for (i = 0; i < SDB_STATIC_ARRAY_LEN(all_lists); ++i) {
- const char *type = all_lists[i].type;
- sdb_llist_t *list = *all_lists[i].list;
-
- size_t len = sdb_llist_len(list);
-
- if (! len)
- continue;
-
- sdb_llist_clear(list);
- sdb_log(SDB_LOG_INFO, "core: Unregistered %zu %s callback%s",
- len, type, len == 1 ? "" : "s");
- }
-} /* plugin_unregister_all */
-
/*
* private types
*/
return 0;
} /* sdb_store_register_writer */
+void
+sdb_plugin_unregister_all(void)
+{
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(all_lists); ++i) {
+ const char *type = all_lists[i].type;
+ sdb_llist_t *list = *all_lists[i].list;
+
+ size_t len = sdb_llist_len(list);
+
+ if (! len)
+ continue;
+
+ sdb_llist_clear(list);
+ sdb_log(SDB_LOG_INFO, "core: Unregistered %zu %s callback%s",
+ len, type, len == 1 ? "" : "s");
+ }
+} /* sdb_plugin_unregister_all */
+
sdb_plugin_ctx_t
sdb_plugin_get_ctx(void)
{
CTX(sdb_llist_iter_get_next(iter))->use_cnt = 0;
sdb_llist_iter_destroy(iter);
- plugin_unregister_all();
+ sdb_plugin_unregister_all();
return 0;
} /* sdb_plugin_reconfigure_init */
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_host(name, last_update, writer->w_user_data))
- status = -1;
+ s = writer->impl.store_host(name, last_update, writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_service(hostname, name, last_update,
- writer->w_user_data))
- status = -1;
+ s = writer->impl.store_service(hostname, name, last_update,
+ writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
if ((! hostname) || (! name))
return -1;
- if ((! store->type) || (! store->id))
+ if (store && ((! store->type) || (! store->id)))
store = NULL;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_metric(hostname, name, store, last_update,
- writer->w_user_data))
- status = -1;
+ s = writer->impl.store_metric(hostname, name, store, last_update,
+ writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_attribute(hostname, key, value, last_update,
- writer->w_user_data))
- status = -1;
+ s = writer->impl.store_attribute(hostname, key, value, last_update,
+ writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
@@ -1438,11 +1446,13 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_service_attr(hostname, service,
- key, value, last_update, writer->w_user_data))
- status = -1;
+ s = writer->impl.store_service_attr(hostname, service,
+ key, value, last_update, writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_metric_attr(hostname, metric,
- key, value, last_update, writer->w_user_data))
- status = -1;
+ s = writer->impl.store_metric_attr(hostname, metric,
+ key, value, last_update, writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;