X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=8f5cae350c6de13f68ddf75cb0741ada5f1f9950;hp=19faee43994bdde816a6a84f4c09061bfb25bb4f;hb=ddb933096618a6bceded29e4dc2b37cb72134366;hpb=23760ca65713cd9b8338f09bf45ec20ff4c3ef8d

diff --git a/src/core/store.c b/src/core/store.c
index 19faee4..8f5cae3 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -27,8 +27,8 @@
 
 #include "sysdb.h"
 #include "core/store.h"
-#include "core/error.h"
 #include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -446,11 +446,11 @@ sdb_store_service(const char *hostname, const char *name,
 
 /* TODO: actually support hierarchical data */
 int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf)
 {
 	sdb_llist_iter_t *host_iter;
 
-	if (! fh)
+	if (! buf)
 		return -1;
 
 	pthread_rwlock_rdlock(&obj_lock);
@@ -461,6 +461,8 @@ sdb_store_dump(FILE *fh)
 		return -1;
 	}
 
+	sdb_strbuf_append(buf, "{\"hosts\":[");
+
 	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;
@@ -475,17 +477,21 @@ sdb_store_dump(FILE *fh)
 			snprintf(time_str, sizeof(time_str), "<error>");
 		time_str[sizeof(time_str) - 1] = '\0';
 
-		fprintf(fh, "Host '%s' (last updated: %s):\n",
+		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];
-			fprintf(fh, "Failed to retrieve attributes: %s\n",
+			sdb_log(SDB_LOG_ERR, "store: Failed to retrieve attributes: %s\n",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			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);
@@ -495,18 +501,21 @@ sdb_store_dump(FILE *fh)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
+			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",
+			sdb_log(SDB_LOG_ERR, "store: Failed to retrieve services: %s\n",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"services: %s\"}", errbuf);
 		}
 
 		while (sdb_llist_iter_has_next(svc_iter)) {
@@ -518,17 +527,21 @@ sdb_store_dump(FILE *fh)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tService '%s' (last updated: %s)\n",
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"last_update\": \"%s\"},",
 					SDB_OBJ(svc)->name, time_str);
 		}
 
 		sdb_llist_iter_destroy(svc_iter);
+		sdb_strbuf_append(buf, "]}");
 	}
 
+	sdb_strbuf_append(buf, "]}");
+
 	sdb_llist_iter_destroy(host_iter);
 	pthread_rwlock_unlock(&obj_lock);
 	return 0;
-} /* sdb_store_dump */
+} /* sdb_store_tojson */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */