From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 3 Jan 2014 12:50:34 +0000 (+0100)
Subject: store: Introduced sdb_store_host_tojson() to serialize a single host.
X-Git-Tag: sysdb-0.1.0~256
X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=commitdiff_plain;h=ebc8f66f721bbe6a23e32f6712003b34f588b508

store: Introduced sdb_store_host_tojson() to serialize a single host.
---

diff --git a/src/core/store.c b/src/core/store.c
index e0c1ac6..50b39d5 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -456,96 +456,114 @@ sdb_store_service(const char *hostname, const char *name,
 	return status;
 } /* sdb_store_service */
 
-/* TODO: actually support hierarchical data */
 int
-sdb_store_tojson(sdb_strbuf_t *buf)
+sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf)
 {
-	sdb_llist_iter_t *host_iter;
+	sdb_store_obj_t *host;
 
-	if (! buf)
-		return -1;
+	sdb_llist_iter_t *svc_iter;
+	sdb_llist_iter_t *attr_iter;
 
-	pthread_rwlock_rdlock(&obj_lock);
+	char time_str[64];
 
-	host_iter = sdb_llist_get_iter(obj_list);
-	if (! host_iter) {
-		pthread_rwlock_unlock(&obj_lock);
+	if ((! h) || (h->type != SDB_HOST) || (! buf))
 		return -1;
+
+	host = SDB_STORE_OBJ(h);
+
+	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';
+
+	sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+			"\"last_update\": \"%s\", "
+			"\"attributes\": [",
+			SDB_OBJ(host)->name, time_str);
+
+	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);
 	}
 
-	sdb_strbuf_append(buf, "{\"hosts\":[");
+	/* 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);
 
-	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;
+		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';
 
-		char time_str[64];
+		sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+				"\"value\": \"%s\", \"last_update\": \"%s\"},",
+				SDB_OBJ(attr)->name, attr->value, time_str);
+	}
 
-		assert(host);
+	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];
+		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 (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 (! sdb_strftime(time_str, sizeof(time_str),
-					"%F %T %z", host->_last_update))
+					"%F %T %z", svc->_last_update))
 			snprintf(time_str, sizeof(time_str), "<error>");
 		time_str[sizeof(time_str) - 1] = '\0';
 
 		sdb_strbuf_append(buf, "{\"name\": \"%s\", "
-				"\"last_update\": \"%s\", "
-				"\"attributes\": [",
-				SDB_OBJ(host)->name, time_str);
-
-		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);
-		}
+				"\"last_update\": \"%s\"},",
+				SDB_OBJ(svc)->name, time_str);
+	}
 
-		/* 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);
+	sdb_llist_iter_destroy(svc_iter);
+	sdb_strbuf_append(buf, "]}");
+	return 0;
+} /* sdb_store_host_tojson */
 
-			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';
+/* TODO: actually support hierarchical data */
+int
+sdb_store_tojson(sdb_strbuf_t *buf)
+{
+	sdb_llist_iter_t *host_iter;
 
-			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
-					"\"value\": \"%s\", \"last_update\": \"%s\"},",
-					SDB_OBJ(attr)->name, attr->value, time_str);
-		}
+	if (! buf)
+		return -1;
 
-		sdb_llist_iter_destroy(attr_iter);
-		sdb_strbuf_append(buf, "], \"services\": [");
+	pthread_rwlock_rdlock(&obj_lock);
 
-		svc_iter = sdb_llist_get_iter(host->children);
-		if (! svc_iter) {
-			char errbuf[1024];
-			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);
-		}
+	host_iter = sdb_llist_get_iter(obj_list);
+	if (! host_iter) {
+		pthread_rwlock_unlock(&obj_lock);
+		return -1;
+	}
 
-		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);
+	sdb_strbuf_append(buf, "{\"hosts\":[");
 
-			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';
+	while (sdb_llist_iter_has_next(host_iter)) {
+		sdb_store_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
+		assert(host);
 
-			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
-					"\"last_update\": \"%s\"},",
-					SDB_OBJ(svc)->name, time_str);
-		}
+		if (sdb_store_host_tojson(host, buf))
+			return -1;
 
-		sdb_llist_iter_destroy(svc_iter);
-		sdb_strbuf_append(buf, "]},");
+		if (sdb_llist_iter_has_next(host_iter))
+			sdb_strbuf_append(buf, ",");
 	}
 
 	sdb_strbuf_append(buf, "]}");
diff --git a/src/include/core/store.h b/src/include/core/store.h
index 5558e77..99b2ead 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -119,6 +119,18 @@ sdb_store_service(const char *hostname, const char *name,
 int
 sdb_store_tojson(sdb_strbuf_t *buf);
 
+/*
+ * sdb_store_host_tojson:
+ * Serialize a host object to JSON and append the result to the specified
+ * buffer.
+ *
+ * Returns:
+ *  - 0 on success
+ *  - a negative value on error
+ */
+int
+sdb_store_host_tojson(sdb_store_base_t *host, sdb_strbuf_t *buf);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/t/core/store_test.c b/t/core/store_test.c
index afc5323..c27310d 100644
--- a/t/core/store_test.c
+++ b/t/core/store_test.c
@@ -174,7 +174,7 @@ START_TEST(test_store_tojson)
 			"\"services\": ["
 				"{\"name\": \"s1\", \"last_update\": \"1970-01-01 00:00:00 +0000\"},"
 				"{\"name\": \"s2\", \"last_update\": \"1970-01-01 00:00:00 +0000\"},"
-			"]},"
+			"]}"
 	"]}";
 
 	sdb_store_host("h1", 1);