nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Geary.Db.DatabaseConnection: Add SQL debug logging when txns fail

Browse source 
This isn't a good place to do it, but neither GLib's error model not the
engine's database model makes it possible to getting access to
transaction state otherwise at the moment.
This commit is contained in:
Michael Gratton 2020-09-04 00:39:30 +10:00 • committed by Michael James Gratton
parent 51ad8458a9
commit dcad419b03
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/engine/db/db-database-connection.vala
View file

@ -191,8 +191,16 @@ public class Geary.Db.DatabaseConnection : Context, Connection {
// perform the transaction
outcome = cb(txn_cx, cancellable);
} catch (GLib.Error err) {
if (!(err is GLib.IOError.CANCELLED))
if (!(err is GLib.IOError.CANCELLED)) {
debug("Connection.exec_transaction: transaction threw error: %s", err.message);
// XXX txn logs really should be passed up with the
// error, or made available after the transaction, but
// neither GLib's error model nor Db's model allows
// that
foreach (var statement in txn_cx.transaction_log) {
debug(" - %s", statement);
}
}
caught_err = err;
}
@ -205,6 +213,15 @@ public class Geary.Db.DatabaseConnection : Context, Connection {
} catch (GLib.Error err) {
debug("Connection.exec_transaction: Unable to %s transaction: %s", outcome.to_string(),
err.message);
if (caught_err == null) {
// XXX as per above, txn logs really should be passed up
// with the error, or made available after the
// transaction, but neither GLib's error model nor Db's
// model allows that
foreach (var statement in txn_cx.transaction_log) {
debug(" - %s", statement);
}
}
}
if (caught_err != null) {