aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

db: add generic warn/error function.

Browse Source 
This avoids the mess where we override db_fatal for teqsts, and keeps it
generic.

Also allows us to get rid of one #if DEVELOPER, and an ugly global for
bookkeeper.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-06-30 04:53:08 +09:30
parent bef137209d
commit 04f485aee0
15 changed files with 149 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/exec.c
View File

@@ -113,7 +113,7 @@ static void db_data_version_incr(struct db *db)
db_bind_int(stmt, 0, db->data_version);
db_exec_prepared_v2(stmt);
if (db_count_changes(stmt) != 1)
db_fatal("Optimistic lock on the database failed. There"
db_fatal(stmt->db, "Optimistic lock on the database failed. There"
" may be a concurrent access to the database."
" Aborting since concurrent access is unsafe.");
tal_free(stmt);
@@ -124,7 +124,7 @@ void db_begin_transaction_(struct db *db, const char *location)
{
bool ok;
if (db->in_transaction)
db_fatal("Already in transaction from %s", db->in_transaction);
db_fatal(db, "Already in transaction from %s", db->in_transaction);
/* No writes yet. */
db->dirty = false;
@@ -132,7 +132,7 @@ void db_begin_transaction_(struct db *db, const char *location)
db_prepare_for_changes(db);
ok = db->config->begin_tx_fn(db);
if (!ok)
db_fatal("Failed to start DB transaction: %s", db->error);
db_fatal(db, "Failed to start DB transaction: %s", db->error);
db->in_transaction = location;
}
@@ -156,7 +156,7 @@ void db_commit_transaction(struct db *db)
ok = db->config->commit_tx_fn(db);
if (!ok)
db_fatal("Failed to commit DB transaction: %s", db->error);
db_fatal(db, "Failed to commit DB transaction: %s", db->error);
db->in_transaction = NULL;
db->dirty = false;