projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscvs to tla changeset 71
[onak.git]
/
keydb_db3.c
diff --git
a/keydb_db3.c
b/keydb_db3.c
index 21977193fd41cf9fb2f1b72d5b439e378becb7c2..7ca5312612c5264aaba5fb38124f840cf6cc271b 100644
(file)
--- a/
keydb_db3.c
+++ b/
keydb_db3.c
@@
-135,7
+135,10
@@
void initdb(void)
DB_CREATE,
0);
if (ret != 0) {
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);
}
exit(1);
}
@@
-152,7
+155,10
@@
void initdb(void)
DB_CREATE,
0664);
if (ret != 0) {
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);
}
exit(1);
}
@@
-167,7
+173,10
@@
void initdb(void)
DB_CREATE,
0664);
if (ret != 0) {
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);
}
exit(1);
}
@@
-182,6
+191,7
@@
void initdb(void)
*/
void cleanupdb(void)
{
*/
void cleanupdb(void)
{
+ txn_checkpoint(dbenv, 0, 0, 0);
worddb->close(worddb, 0);
worddb = NULL;
dbconn->close(dbconn, 0);
worddb->close(worddb, 0);
worddb = NULL;
dbconn->close(dbconn, 0);
@@
-209,7
+219,9
@@
bool starttrans(void)
&txn,
0);
if (ret != 0) {
&txn,
0);
if (ret != 0) {
- dbenv->err(dbenv, ret, "starttrans():");
+ logthing(LOGTHING_CRITICAL,
+ "Error starting transaction: %s",
+ db_strerror(ret));
exit(1);
}
exit(1);
}
@@
-231,7
+243,9
@@
void endtrans(void)
ret = txn_commit(txn,
0);
if (ret != 0) {
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;
exit(1);
}
txn = NULL;
@@
-291,7
+305,9
@@
int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
packets = NULL;
numkeys++;
} else if (ret != DB_NOTFOUND) {
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) {
}
if (!intrans) {
@@
-493,7
+509,9
@@
int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
&data,
0); /* flags*/
if (ret != 0) {
&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;
}
if (ret == DB_LOCK_DEADLOCK) {
deadlock = true;
}
@@
-550,8
+568,9
@@
int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
&data,
0);
if (ret != 0) {
&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;
}
if (ret == DB_LOCK_DEADLOCK) {
deadlock = true;
}
@@
-657,14
+676,16
@@
int delete_key(uint64_t keyid, bool intrans)
if (ret == 0) {
ret = cursor->c_del(cursor, 0);
if (ret != 0) {
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) {
}
}
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;
}
if (ret == DB_LOCK_DEADLOCK) {
deadlock = true;
}
@@
-738,7
+759,10
@@
int dumpdb(char *filenamebase)
memset(&data, 0, sizeof(data));
ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
}
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);
close(fd);