[taler-merchant] branch master updated: a few more checks for #6774, but still unable to reproduce

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new c252aa91 a few more checks for #6774, but still unable to reproduce
c252aa91 is described below

commit c252aa91ad616bdd9a353740427a56eb5cdc7b64
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jul 3 14:00:11 2022 +0200

    a few more checks for #6774, but still unable to reproduce
---
 src/backend/taler-merchant-httpd_post-tips-ID-pickup.c | 3 +++
 src/backenddb/plugin_merchantdb_postgres.c             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c 
b/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c
index 7d3f7806..32d78eca 100644
--- a/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c
+++ b/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c
@@ -290,6 +290,7 @@ withdraw_cb (void *cls,
   GNUNET_CONTAINER_DLL_remove (pc->po_head,
                                pc->po_tail,
                                po);
+  TMH_db->preflight (TMH_db->cls);
   if (NULL == blind_sig)
   {
     GNUNET_free (po);
@@ -361,6 +362,7 @@ do_withdraw (void *cls,
   struct PickupContext *pc = po->pc;
 
   po->fo = NULL;
+  TMH_db->preflight (TMH_db->cls);
   if (NULL == hr)
   {
     stop_operations (pc);
@@ -421,6 +423,7 @@ try_withdraw (struct PickupContext *pc,
 {
   struct PlanchetOperation *po;
 
+  TMH_db->preflight (TMH_db->cls);
   po = GNUNET_new (struct PlanchetOperation);
   po->pc = pc;
   po->pd = *planchet;
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 9b39365b..57ad85e6 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -229,7 +229,7 @@ postgres_preflight (void *cls)
   struct PostgresClosure *pg = cls;
 
   if (NULL == pg->transaction_name)
-    return; /* all good */
+    return true; /* all good */
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "BUG: Preflight check detected running transaction `%s'!\n",
               pg->transaction_name);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.