X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/394938c479925750ffe56c28d281945ba4003a14..a534b3b856a1e3cbfe60bc0bca432e802f9718be:/sixdegrees.c

diff --git a/sixdegrees.c b/sixdegrees.c
index 0dd324f..b746327 100644
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -13,6 +13,7 @@
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "stats.h"
 
@@ -29,7 +30,8 @@ unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 
 	while (curll != NULL && curdegree <= maxdegree) {
 		if (sigs) {
-			sigll = cached_getkeysigs(((struct stats_key *)
+			sigll = config.dbbackend->cached_getkeysigs(
+				((struct stats_key *)
 				curll->object)->keyid);
 		} else {
 			sigll = NULL;
@@ -81,15 +83,16 @@ void sixdegrees(uint64_t keyid)
 	long degree;
 	char *uid;
 
-	cached_getkeysigs(keyid);
+	config.dbbackend->cached_getkeysigs(keyid);
 
 	if ((keyinfo = findinhash(keyid)) == NULL) {
-		printf("Couldn't find key 0x%llX.\n", keyid);
+		printf("Couldn't find key 0x%016" PRIX64 ".\n", keyid);
 		return;
 	}
 
-	uid = keyid2uid(keyinfo->keyid);
-	printf("Six degrees for 0x%llX (%s):\n", keyinfo->keyid, uid);
+	uid = config.dbbackend->keyid2uid(keyinfo->keyid);
+	printf("Six degrees for 0x%016" PRIX64 " (%s):\n", keyinfo->keyid,
+			uid);
 	free(uid);
 	uid = NULL;
 
@@ -125,11 +128,13 @@ int main(int argc, char *argv[])
 	}
 
 	readconfig(NULL);
-	initdb(true);
+	initlogthing("sixdegrees", config.logfile);
+	config.dbbackend->initdb(true);
 	inithash();
-	sixdegrees(getfullkeyid(keyid));
+	sixdegrees(config.dbbackend->getfullkeyid(keyid));
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
+	cleanuplogthing();
 	cleanupconfig();
 
 	return 0;