[taler-merchant] branch master updated: -fix bugs in taler-merchant-depositcheck

[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 0e7856f1 -fix bugs in taler-merchant-depositcheck
0e7856f1 is described below

commit 0e7856f1be9bc2ce3d0386af7a0f115d40d9848e
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jan 10 10:12:48 2024 +0100

    -fix bugs in taler-merchant-depositcheck
---
 src/backend/taler-merchant-depositcheck.c  | 12 ++++++++----
 src/backenddb/pg_lookup_pending_deposits.c |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/backend/taler-merchant-depositcheck.c 
b/src/backend/taler-merchant-depositcheck.c
index 7bf8a61c..7e25c902 100644
--- a/src/backend/taler-merchant-depositcheck.c
+++ b/src/backend/taler-merchant-depositcheck.c
@@ -288,9 +288,6 @@ shutdown_task (void *cls)
   }
   while (NULL != (c = c_head))
   {
-    enum GNUNET_OS_ProcessStatusType type;
-    unsigned long code;
-
     GNUNET_CONTAINER_DLL_remove (c_head,
                                  c_tail,
                                  c);
@@ -306,6 +303,10 @@ shutdown_task (void *cls)
     }
     if (NULL != c->process)
     {
+      enum GNUNET_OS_ProcessStatusType type
+        = GNUNET_OS_PROCESS_UNKNOWN;
+      unsigned long code = 0;
+
       GNUNET_break (0 ==
                     GNUNET_OS_process_kill (c->process,
                                             SIGTERM));
@@ -658,11 +659,14 @@ select_work (void *cls)
         GNUNET_SCHEDULER_shutdown ();
         return;
       }
+      if (retry)
+        return; /* nothing left */
       retry = true;
       continue;
     case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
     default:
-      return; /* wait for completion, then select more work. */
+      /* wait for async completion, then select more work. */
+      return;
     }
   }
 }
diff --git a/src/backenddb/pg_lookup_pending_deposits.c 
b/src/backenddb/pg_lookup_pending_deposits.c
index 2f4cf1a4..6c14464f 100644
--- a/src/backenddb/pg_lookup_pending_deposits.c
+++ b/src/backenddb/pg_lookup_pending_deposits.c
@@ -89,6 +89,8 @@ lookup_deposits_cb (void *cls,
                                             &merchant_priv),
       GNUNET_PQ_result_spec_string ("merchant_id",
                                     &instance_id),
+      GNUNET_PQ_result_spec_absolute_time ("wire_transfer_deadline",
+                                           &wire_deadline),
       GNUNET_PQ_result_spec_auto_from_type ("h_wire",
                                             &h_wire),
       TALER_PQ_result_spec_amount_with_currency ("amount_with_fee",
@@ -158,6 +160,7 @@ TMH_PG_lookup_pending_deposits (
            ",mct.h_contract_terms"
            ",mk.merchant_priv"
            ",mi.merchant_id"
+           ",mdc.wire_transfer_deadline"
            ",ma.h_wire"
            ",md.amount_with_fee"
            ",md.deposit_fee"

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