X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0d38a62f4c8e92149a5daade98079fb7445b7a0b..7b7cb978ab032edb192effcd9eac443d8800b565:/keydb_db3.c?ds=sidebyside

diff --git a/keydb_db3.c b/keydb_db3.c
index 2197719..1aba919 100644
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: keydb_db3.c,v 1.16 2003/06/04 20:57:08 noodles Exp $
  */
 
 #include <assert.h>
@@ -135,7 +137,10 @@ void initdb(void)
 			DB_CREATE,
 			0);
 	if (ret != 0) {
-		dbenv->err(dbenv, ret, "%s", config.db_dir);
+		logthing(LOGTHING_CRITICAL,
+				"Erroring opening db environment: %s (%s)",
+				config.db_dir,
+				db_strerror(ret));
 		exit(1);
 	}
 
@@ -152,7 +157,10 @@ void initdb(void)
 			DB_CREATE,
 			0664);
 	if (ret != 0) {
-		dbconn->err(dbconn, ret, "keydb.db");
+		logthing(LOGTHING_CRITICAL,
+				"Error opening key database: %s (%s)",
+				"keydb.db",
+				db_strerror(ret));
 		exit(1);
 	}
 
@@ -167,7 +175,10 @@ void initdb(void)
 			DB_CREATE,
 			0664);
 	if (ret != 0) {
-		worddb->err(worddb, ret, "worddb");
+		logthing(LOGTHING_CRITICAL,
+				"Error opening word database: %s (%s)",
+				"worddb",
+				db_strerror(ret));
 		exit(1);
 	}
 	
@@ -182,6 +193,7 @@ void initdb(void)
  */
 void cleanupdb(void)
 {
+	txn_checkpoint(dbenv, 0, 0, 0);
 	worddb->close(worddb, 0);
 	worddb = NULL;
 	dbconn->close(dbconn, 0);
@@ -209,7 +221,9 @@ bool starttrans(void)
 		&txn,
 		0);
 	if (ret != 0) {
-		dbenv->err(dbenv, ret, "starttrans():");
+		logthing(LOGTHING_CRITICAL,
+				"Error starting transaction: %s",
+				db_strerror(ret));
 		exit(1);
 	}
 
@@ -231,7 +245,9 @@ void endtrans(void)
 	ret = txn_commit(txn,
 		0);
 	if (ret != 0) {
-		dbenv->err(dbenv, ret, "endtrans():");
+		logthing(LOGTHING_CRITICAL,
+				"Error ending transaction: %s",
+				db_strerror(ret));
 		exit(1);
 	}
 	txn = NULL;
@@ -291,7 +307,9 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 		packets = NULL;
 		numkeys++;
 	} else if (ret != DB_NOTFOUND) {
-		dbconn->err(dbconn, ret, "Problem retrieving key");
+		logthing(LOGTHING_ERROR,
+				"Problem retrieving key: %s",
+				db_strerror(ret));
 	}
 
 	if (!intrans) {
@@ -493,7 +511,9 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 				&data,
 				0); /* flags*/
 		if (ret != 0) {
-			dbconn->err(dbconn, ret, "Problem storing key");
+			logthing(LOGTHING_ERROR,
+					"Problem storing key: %s",
+					db_strerror(ret));
 			if (ret == DB_LOCK_DEADLOCK) {
 				deadlock = true;
 			}
@@ -550,8 +570,9 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 				&data,
 				0);
 			if (ret != 0) {
-				worddb->err(worddb, ret,
-					"Problem storing key");
+				logthing(LOGTHING_ERROR,
+					"Problem storing word: %s",
+					db_strerror(ret));
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
@@ -657,14 +678,16 @@ int delete_key(uint64_t keyid, bool intrans)
 			if (ret == 0) {
 				ret = cursor->c_del(cursor, 0);
 				if (ret != 0) {
-					worddb->err(worddb, ret,
-						"Problem deleting word.");
+					logthing(LOGTHING_ERROR,
+						"Problem deleting word: %s",
+						db_strerror(ret));
 				}
 			}
 
 			if (ret != 0) {
-				worddb->err(worddb, ret,
-					"Problem deleting word.");
+				logthing(LOGTHING_ERROR,
+					"Problem deleting word: %s",
+					db_strerror(ret));
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
@@ -738,7 +761,10 @@ int dumpdb(char *filenamebase)
 		memset(&data, 0, sizeof(data));
 		ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
 	}
-	dbconn->err(dbconn, ret, "Problem reading key");
+	if (ret != DB_NOTFOUND) {
+		logthing(LOGTHING_ERROR, "Problem reading key: %s",
+				db_strerror(ret));
+	}
 
 	close(fd);