X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e9e0979e72e4db10ec99d34f2596f178c5d19317;hp=f80c49e15d8964c606a32dad0470755cef9efed3;hb=ddb7ffc175e49abfa69c82777b88d73e1f1103fb;hpb=22b93dff4d8c4eed238d60f7f6ddc43604206acd

diff --git a/src/core/store.c b/src/core/store.c
index f80c49e..e9e0979 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -1,5 +1,5 @@
 /*
- * syscollector - src/core/store.c
+ * SysDB - src/core/store.c
  * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
  * All rights reserved.
  *
@@ -25,10 +25,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "syscollector.h"
+#include "sysdb.h"
 #include "core/store.h"
+#include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/llist.h"
-#include "utils/string.h"
 
 #include <assert.h>
 
@@ -44,379 +45,507 @@
  * private variables
  */
 
-static sc_llist_t *host_list = NULL;
-static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
+static sdb_llist_t *obj_list = NULL;
+static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 /*
- * private helper functions
+ * private types
  */
 
+static sdb_type_t sdb_store_obj_type;
+static sdb_type_t sdb_attribute_type;
+
+struct store_obj;
+typedef struct store_obj store_obj_t;
+
+struct store_obj {
+	sdb_object_t super;
+	sdb_time_t last_update;
+	store_obj_t *parent;
+};
+#define STORE_OBJ(obj) ((store_obj_t *)(obj))
+#define STORE_CONST_OBJ(obj) ((const store_obj_t *)(obj))
+
+typedef struct {
+	store_obj_t super;
+
+	char *value;
+} sdb_attribute_t;
+#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
+#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+
+typedef struct {
+	store_obj_t super;
+
+	int type;
+	sdb_llist_t *children;
+
+	sdb_llist_t *attributes;
+} sdb_store_obj_t;
+#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
+#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
+
+enum {
+	SDB_HOST = 1,
+	SDB_SERVICE,
+	SDB_ATTRIBUTE,
+};
+#define TYPE_TO_NAME(t) \
+	(((t) == SDB_HOST) ? "host" \
+		: ((t) == SDB_SERVICE) ? "service" \
+		: ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
+
+/* shortcuts for accessing the sdb_store_obj_t attributes
+ * of inheriting objects */
+#define _last_update super.last_update
+
 static int
-sc_store_obj_cmp_by_name(const sc_object_t *a, const sc_object_t *b)
+store_obj_init(sdb_object_t *obj, va_list ap)
+{
+	store_obj_t *sobj = STORE_OBJ(obj);
+	sobj->last_update = va_arg(ap, sdb_time_t);
+
+	sobj->parent = NULL;
+	return 0;
+} /* store_obj_init */
+
+static void
+store_obj_destroy(sdb_object_t *obj)
 {
-	const sc_store_obj_t *h1 = (const sc_store_obj_t *)a;
-	const sc_store_obj_t *h2 = (const sc_store_obj_t *)b;
+	const store_obj_t *sobj = STORE_OBJ(obj);
 
-	assert(h1 && h2);
-	return strcasecmp(h1->name, h2->name);
-} /* sc_store_obj_cmp_by_name */
+	if (sobj->parent)
+		sdb_object_deref(SDB_OBJ(sobj->parent));
+} /* store_obj_destroy */
 
 static int
-sc_host_init(sc_object_t *obj, va_list ap)
+sdb_store_obj_init(sdb_object_t *obj, va_list ap)
 {
-	char *name = va_arg(ap, char *);
+	sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
+	int ret;
 
-	SC_HOST(obj)->host_name = strdup(name);
-	if (! SC_HOST(obj)->host_name)
-		return -1;
+	ret = store_obj_init(obj, ap);
+	if (ret)
+		return ret;
 
-	SC_HOST(obj)->host_last_update = sc_gettime();
-	/* ignore errors -> last_update will be updated later */
+	sobj->type = va_arg(ap, int);
 
-	SC_HOST(obj)->services = sc_llist_create();
-	if (! SC_HOST(obj)->services)
+	sobj->children = sdb_llist_create();
+	if (! sobj->children)
+		return -1;
+	sobj->attributes = sdb_llist_create();
+	if (! sobj->attributes)
 		return -1;
 	return 0;
-} /* sc_host_init */
+} /* sdb_store_obj_init */
 
 static void
-sc_host_destroy(sc_object_t *obj)
+sdb_store_obj_destroy(sdb_object_t *obj)
 {
+	sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
+
 	assert(obj);
 
-	if (SC_HOST(obj)->host_name)
-		free(SC_HOST(obj)->host_name);
+	store_obj_destroy(obj);
 
-	if (SC_HOST(obj)->services)
-		sc_llist_destroy(SC_HOST(obj)->services);
-} /* sc_host_destroy */
+	if (sobj->children)
+		sdb_llist_destroy(sobj->children);
+	if (sobj->attributes)
+		sdb_llist_destroy(sobj->attributes);
+} /* sdb_store_obj_destroy */
 
 static int
-sc_svc_init(sc_object_t *obj, va_list ap)
+sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
-	char *hostname = va_arg(ap, char *);
-	char *name = va_arg(ap, char *);
+	const char *value;
+	int ret;
 
-	SC_SVC(obj)->hostname = strdup(hostname);
-	SC_SVC(obj)->svc_name = strdup(name);
-	if ((! SC_SVC(obj)->hostname) || (! SC_SVC(obj)->svc_name))
-		return -1;
+	ret = store_obj_init(obj, ap);
+	if (ret)
+		return ret;
+	value = va_arg(ap, const char *);
 
-	SC_SVC(obj)->svc_last_update = sc_gettime();
-	/* ignore errors -> last_update will be updated later */
+	if (value) {
+		SDB_ATTR(obj)->value = strdup(value);
+		if (! SDB_ATTR(obj)->value)
+			return -1;
+	}
 	return 0;
-} /* sc_svc_init */
+} /* sdb_attr_init */
 
 static void
-sc_svc_destroy(sc_object_t *obj)
+sdb_attr_destroy(sdb_object_t *obj)
 {
 	assert(obj);
 
-	if (SC_SVC(obj)->hostname)
-		free(SC_SVC(obj)->hostname);
-	if (SC_SVC(obj)->svc_name)
-		free(SC_SVC(obj)->svc_name);
-} /* sc_svc_destroy */
+	store_obj_destroy(obj);
+
+	if (SDB_ATTR(obj)->value)
+		free(SDB_ATTR(obj)->value);
+} /* sdb_attr_destroy */
+
+static sdb_type_t sdb_store_obj_type = {
+	sizeof(sdb_store_obj_t),
+
+	sdb_store_obj_init,
+	sdb_store_obj_destroy
+};
+
+static sdb_type_t sdb_attribute_type = {
+	sizeof(sdb_attribute_t),
+
+	sdb_attr_init,
+	sdb_attr_destroy
+};
 
 /*
- * public API
+ * private helper functions
  */
 
-sc_host_t *
-sc_host_create(char *name)
+static sdb_store_obj_t *
+sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 {
-	sc_object_t *obj;
+	sdb_llist_iter_t *iter;
 
-	if (! name)
+	if (! l)
 		return NULL;
 
-	obj = sc_object_create(sizeof(sc_host_t), sc_host_init,
-			sc_host_destroy, name);
-	if (! obj)
+	iter = sdb_llist_get_iter(l);
+	if (! iter)
 		return NULL;
-	return SC_HOST(obj);
-} /* sc_host_create */
 
-sc_host_t *
-sc_host_clone(const sc_host_t *host)
-{
-	sc_host_t *clone;
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_store_obj_t *sobj = SDB_STORE_OBJ(sdb_llist_iter_get_next(iter));
+		assert(sobj);
 
-	clone = sc_host_create(host->host_name);
-	if (! clone)
-		return NULL;
+		if ((sobj->type == type)
+				&& (! strcasecmp(SDB_OBJ(sobj)->name, name))) {
+			sdb_llist_iter_destroy(iter);
+			return sobj;
+		}
 
-	clone->host_last_update = host->host_last_update;
-	if (host->services) {
-		clone->services = sc_llist_clone(host->services);
-		if (! clone->services) {
-			sc_object_deref(SC_OBJ(clone));
-			return NULL;
+		sobj = sdb_store_lookup_in_list(sobj->children, type, name);
+		if (sobj) {
+			sdb_llist_iter_destroy(iter);
+			return sobj;
 		}
 	}
-	else
-		clone->services = NULL;
-	return clone;
-} /* sc_host_clone */
+	sdb_llist_iter_destroy(iter);
+	return NULL;
+} /* sdb_store_lookup_in_list */
 
-int
-sc_store_host(const sc_host_t *host)
+static sdb_store_obj_t *
+sdb_store_lookup(int type, const char *name)
 {
-	sc_time_t last_update;
+	return sdb_store_lookup_in_list(obj_list, type, name);
+} /* sdb_store_lookup */
 
-	sc_host_t *old;
-	int status = 0;
+/* The obj_lock has to be acquired before calling this function. */
+static int
+store_obj(int parent_type, const char *parent_name,
+		int type, const char *name, sdb_time_t last_update,
+		store_obj_t **updated_obj)
+{
+	char *parent_cname = NULL, *cname = NULL;
 
-	if ((! host) || (! host->host_name))
-		return -1;
+	sdb_llist_t *parent_list;
+	store_obj_t *old;
+	int status = 0;
 
-	last_update = host->host_last_update;
 	if (last_update <= 0)
-		last_update = sc_gettime();
-
-	pthread_rwlock_wrlock(&host_lock);
+		last_update = sdb_gettime();
+
+	assert((parent_type == 0)
+			|| (parent_type == SDB_HOST)
+			|| (parent_type == SDB_SERVICE));
+	assert((type == 0)
+			|| (type == SDB_HOST)
+			|| (type == SDB_SERVICE)
+			|| (type == SDB_ATTRIBUTE));
+
+	if (parent_type == SDB_HOST) {
+		parent_cname = sdb_plugin_cname(strdup(parent_name));
+		if (! parent_cname) {
+			sdb_log(SDB_LOG_ERR, "store: strdup failed");
+			return -1;
+		}
+		parent_name = parent_cname;
+	}
+	if (type == SDB_HOST) {
+		cname = sdb_plugin_cname(strdup(name));
+		if (! cname) {
+			sdb_log(SDB_LOG_ERR, "store: strdup failed");
+			return -1;
+		}
+		name = cname;
+	}
 
-	if (! host_list) {
-		if (! (host_list = sc_llist_create())) {
-			pthread_rwlock_unlock(&host_lock);
+	if (! obj_list) {
+		if (! (obj_list = sdb_llist_create())) {
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
 	}
+	parent_list = obj_list;
+
+	if (parent_type && parent_name) {
+		sdb_store_obj_t *parent;
+
+		parent = sdb_store_lookup(parent_type, parent_name);
+		if (! parent) {
+			sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
+					"parent %s '%s' not found", TYPE_TO_NAME(type), name,
+					TYPE_TO_NAME(parent_type), parent_name);
+			free(parent_cname);
+			free(cname);
+			return -1;
+		}
+
+		if (type == SDB_ATTRIBUTE)
+			parent_list = parent->attributes;
+		else
+			parent_list = parent->children;
+	}
 
-	old = SC_HOST(sc_llist_search(host_list, (const sc_object_t *)host,
-				sc_store_obj_cmp_by_name));
+	/* TODO: only look into direct children? */
+	if (type == SDB_HOST)
+		/* make sure that each host is unique */
+		old = STORE_OBJ(sdb_store_lookup_in_list(obj_list, type, name));
+	else if (type == SDB_ATTRIBUTE)
+		old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
+	else
+		old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name));
 
 	if (old) {
-		if (old->host_last_update > last_update) {
-			fprintf(stderr, "store: Cannot update host '%s' - "
-					"value too old (%"PRIscTIME" < %"PRIscTIME")\n",
-					host->host_name, last_update, old->host_last_update);
-			/* don't report an error; the host may be updated by multiple
+		if (old->last_update > last_update) {
+			sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
+					"value too old (%"PRIscTIME" < %"PRIscTIME")",
+					TYPE_TO_NAME(type), name, last_update, old->last_update);
+			/* don't report an error; the object may be updated by multiple
 			 * backends */
-			status = 0;
+			status = 1;
 		}
 		else {
-			old->host_last_update = last_update;
+			old->last_update = last_update;
 		}
+
+		if (updated_obj)
+			*updated_obj = old;
 	}
 	else {
-		sc_host_t *new = sc_host_clone(host);
+		store_obj_t *new;
+
+		if (type == SDB_ATTRIBUTE)
+			/* the value will be updated by the caller */
+			new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
+						last_update, NULL));
+		else
+			new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type,
+						last_update, type));
+
 		if (! new) {
 			char errbuf[1024];
-			fprintf(stderr, "store: Failed to clone host object: %s\n",
-					sc_strerror(errno, errbuf, sizeof(errbuf)));
+			sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
+					TYPE_TO_NAME(type), name,
+					sdb_strerror(errno, errbuf, sizeof(errbuf)));
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
 
-		if (! new->services) {
-			if (! (new->services = sc_llist_create())) {
-				char errbuf[1024];
-				fprintf(stderr, "store: Failed to initialize "
-						"host object '%s': %s\n", host->host_name,
-						sc_strerror(errno, errbuf, sizeof(errbuf)));
-				sc_object_deref(SC_OBJ(new));
-				return -1;
-			}
-		}
-
-		status = sc_llist_insert_sorted(host_list, SC_OBJ(new),
-				sc_store_obj_cmp_by_name);
+		/* TODO: insert type-aware; the current version works as long as we
+		 * don't support to store hierarchical data */
+		status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
+				sdb_object_cmp_by_name);
 
 		/* pass control to the list or destroy in case of an error */
-		sc_object_deref(SC_OBJ(new));
-	}
+		sdb_object_deref(SDB_OBJ(new));
 
-	pthread_rwlock_unlock(&host_lock);
+		if (updated_obj)
+			*updated_obj = new;
+	}
+	free(parent_cname);
+	free(cname);
 	return status;
-} /* sc_store_host */
-
-const sc_host_t *
-sc_store_get_host(char *name)
-{
-	sc_host_t  tmp = SC_HOST_INIT;
-	sc_host_t *host;
-
-	if (! name)
-		return NULL;
-
-	tmp.host_name = name;
-	host = SC_HOST(sc_llist_search(host_list, (const sc_object_t *)&tmp,
-				sc_store_obj_cmp_by_name));
+} /* sdb_store_obj */
 
-	if (! host)
-		return NULL;
-	return host;
-} /* sc_store_get_host */
+/*
+ * public API
+ */
 
-sc_service_t *
-sc_service_create(char *hostname, char *name)
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
 {
-	sc_object_t *obj;
+	int status;
 
-	if ((! hostname) || (! name))
-		return NULL;
+	if (! name)
+		return -1;
 
-	obj = sc_object_create(sizeof(sc_service_t), sc_svc_init,
-			sc_svc_destroy, hostname, name);
-	if (! obj)
-		return NULL;
-	return SC_SVC(obj);
-} /* sc_service_create */
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ 0, NULL,
+			/* stored object = */ SDB_HOST, name, last_update,
+			/* updated_obj = */ NULL);
+	pthread_rwlock_unlock(&obj_lock);
+	return status;
+} /* sdb_store_host */
 
-sc_service_t *
-sc_service_clone(const sc_service_t *svc)
+_Bool
+sdb_store_has_host(const char *name)
 {
-	sc_service_t *clone;
+	sdb_store_obj_t *host;
 
-	clone = sc_service_create(svc->hostname, svc->svc_name);
-	if (! clone)
+	if (! name)
 		return NULL;
 
-	clone->svc_last_update = svc->svc_last_update;
-	return clone;
-} /* sc_service_clone */
+	host = sdb_store_lookup(SDB_HOST, name);
+	return host != NULL;
+} /* sdb_store_has_host */
 
 int
-sc_store_service(const sc_service_t *svc)
+sdb_store_attribute(const char *hostname, const char *key, const char *value,
+		sdb_time_t last_update)
 {
-	sc_host_t  tmp = SC_HOST_INIT;
-	sc_host_t *host;
-
-	sc_service_t *old;
-
-	sc_time_t last_update;
+	int status;
 
-	int status = 0;
-
-	if (! svc)
-		return -1;
-
-	last_update = svc->svc_last_update;
-	if (last_update <= 0)
-		last_update = sc_gettime();
-
-	if (! host_list)
-		return -1;
+	store_obj_t *updated_attr = NULL;
 
-	pthread_rwlock_wrlock(&host_lock);
-
-	tmp.host_name = svc->hostname;
-	host = SC_HOST(sc_llist_search(host_list, (const sc_object_t *)&tmp,
-				sc_store_obj_cmp_by_name));
-
-	if (! host)
+	if ((! hostname) || (! key))
 		return -1;
 
-	old = SC_SVC(sc_llist_search(host->services, (const sc_object_t *)svc,
-				sc_store_obj_cmp_by_name));
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
+			/* stored object = */ SDB_ATTRIBUTE, key, last_update,
+			&updated_attr);
 
-	if (old) {
-		if (old->host_last_update > last_update) {
-			fprintf(stderr, "store: Cannot update service '%s/%s' - "
-					"value too old (%"PRIscTIME" < %"PRIscTIME")\n",
-					svc->hostname, svc->svc_name, last_update,
-					old->host_last_update);
+	if (status >= 0) {
+		assert(updated_attr);
+		SDB_ATTR(updated_attr)->value = strdup(value);
+		if (! SDB_ATTR(updated_attr)->value) {
+			sdb_object_deref(SDB_OBJ(updated_attr));
 			status = -1;
 		}
-		else {
-			old->svc_last_update = last_update;
-		}
-	}
-	else {
-		sc_service_t *new = sc_service_clone(svc);
-		if (! new) {
-			char errbuf[1024];
-			fprintf(stderr, "store: Failed to clone service object: %s\n",
-					sc_strerror(errno, errbuf, sizeof(errbuf)));
-			return -1;
-		}
-
-		status = sc_llist_insert_sorted(host->services, SC_OBJ(new),
-				sc_store_obj_cmp_by_name);
-
-		/* pass control to the list or destroy in case of an error */
-		sc_object_deref(SC_OBJ(new));
 	}
 
-	pthread_rwlock_unlock(&host_lock);
+	pthread_rwlock_unlock(&obj_lock);
 	return status;
-} /* sc_store_service */
+} /* sdb_store_attribute */
 
-const sc_service_t *
-sc_store_get_service(const sc_host_t *host, char *name)
+int
+sdb_store_service(const char *hostname, const char *name,
+		sdb_time_t last_update)
 {
-	sc_service_t  tmp = SC_SVC_INIT;
-	sc_service_t *svc;
-
-	if ((! host) || (! name))
-		return NULL;
+	int status;
 
-	tmp.svc_name = name;
-	svc = SC_SVC(sc_llist_search(host->services, (const sc_object_t *)&tmp,
-				sc_store_obj_cmp_by_name));
+	if ((! hostname) || (! name))
+		return -1;
 
-	if (! svc)
-		return NULL;
-	return svc;
-} /* sc_store_get_service */
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
+			/* stored object = */ SDB_SERVICE, name, last_update,
+			/* updated obj = */ NULL);
+	pthread_rwlock_unlock(&obj_lock);
+	return status;
+} /* sdb_store_service */
 
+/* TODO: actually support hierarchical data */
 int
-sc_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf)
 {
-	sc_llist_iter_t *host_iter;
+	sdb_llist_iter_t *host_iter;
 
-	if (! fh)
+	if (! buf)
 		return -1;
 
-	pthread_rwlock_rdlock(&host_lock);
+	pthread_rwlock_rdlock(&obj_lock);
 
-	host_iter = sc_llist_get_iter(host_list);
-	if (! host_iter)
+	host_iter = sdb_llist_get_iter(obj_list);
+	if (! host_iter) {
+		pthread_rwlock_unlock(&obj_lock);
 		return -1;
+	}
+
+	sdb_strbuf_append(buf, "{\"hosts\":[");
 
-	while (sc_llist_iter_has_next(host_iter)) {
-		sc_host_t *host = SC_HOST(sc_llist_iter_get_next(host_iter));
-		sc_llist_iter_t *svc_iter;
+	while (sdb_llist_iter_has_next(host_iter)) {
+		sdb_store_obj_t *host = SDB_STORE_OBJ(sdb_llist_iter_get_next(host_iter));
+		sdb_llist_iter_t *svc_iter;
+		sdb_llist_iter_t *attr_iter;
 
 		char time_str[64];
 
 		assert(host);
 
-		if (! sc_strftime(time_str, sizeof(time_str),
-					"%F %T %z", host->host_last_update))
+		if (! sdb_strftime(time_str, sizeof(time_str),
+					"%F %T %z", host->_last_update))
 			snprintf(time_str, sizeof(time_str), "<error>");
 		time_str[sizeof(time_str) - 1] = '\0';
 
-		fprintf(fh, "Host '%s' (last updated: %s):\n",
-				host->host_name, time_str);
+		sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+				"\"last_update\": \"%s\", "
+				"\"attributes\": [",
+				SDB_OBJ(host)->name, time_str);
 
-		svc_iter = sc_llist_get_iter(host->services);
+		attr_iter = sdb_llist_get_iter(host->attributes);
+		if (! attr_iter) {
+			char errbuf[1024];
+			sdb_log(SDB_LOG_ERR, "store: Failed to retrieve attributes: %s\n",
+					sdb_strerror(errno, errbuf, sizeof(errbuf)));
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"attributes: %s\"}", errbuf);
+		}
+
+		/* has_next returns false if the iterator is NULL */
+		while (sdb_llist_iter_has_next(attr_iter)) {
+			sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
+			assert(attr);
+
+			if (! sdb_strftime(time_str, sizeof(time_str),
+						"%F %T %z", attr->_last_update))
+				snprintf(time_str, sizeof(time_str), "<error>");
+			time_str[sizeof(time_str) - 1] = '\0';
+
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"value\": \"%s\", \"last_update\": \"%s\"},",
+					SDB_OBJ(attr)->name, attr->value, time_str);
+		}
+
+		sdb_llist_iter_destroy(attr_iter);
+		sdb_strbuf_append(buf, "], \"services\": [");
+
+		svc_iter = sdb_llist_get_iter(host->children);
 		if (! svc_iter) {
 			char errbuf[1024];
-			fprintf(fh, "Failed to retrieve services: %s\n",
-					sc_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			sdb_log(SDB_LOG_ERR, "store: Failed to retrieve services: %s\n",
+					sdb_strerror(errno, errbuf, sizeof(errbuf)));
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"services: %s\"}", errbuf);
 		}
 
-		while (sc_llist_iter_has_next(svc_iter)) {
-			sc_service_t *svc = SC_SVC(sc_llist_iter_get_next(svc_iter));
+		while (sdb_llist_iter_has_next(svc_iter)) {
+			sdb_store_obj_t *svc = SDB_STORE_OBJ(sdb_llist_iter_get_next(svc_iter));
 			assert(svc);
 
-			if (! sc_strftime(time_str, sizeof(time_str),
-						"%F %T %z", host->host_last_update))
+			if (! sdb_strftime(time_str, sizeof(time_str),
+						"%F %T %z", svc->_last_update))
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tService '%s' (last updated: %s)\n",
-					svc->svc_name, time_str);
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"last_update\": \"%s\"},",
+					SDB_OBJ(svc)->name, time_str);
 		}
 
-		sc_llist_iter_destroy(svc_iter);
+		sdb_llist_iter_destroy(svc_iter);
+		sdb_strbuf_append(buf, "]},");
 	}
 
-	sc_llist_iter_destroy(host_iter);
+	sdb_strbuf_append(buf, "]}");
+
+	sdb_llist_iter_destroy(host_iter);
+	pthread_rwlock_unlock(&obj_lock);
 	return 0;
-} /* sc_store_dump */
+} /* sdb_store_tojson */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */