[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: diagnostics for #6581
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: diagnostics for #6581 |
Date: |
Wed, 09 Sep 2020 16:56:29 +0200 |
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 374ef1e diagnostics for #6581
374ef1e is described below
commit 374ef1e098a57a801ed1e1735aec573bc425cc6e
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Sep 9 16:56:26 2020 +0200
diagnostics for #6581
---
src/backend/taler-merchant-httpd.c | 14 ++++++++------
src/backend/taler-merchant-httpd_post-orders-ID-paid.c | 8 ++++++++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index 7104b95..22e11d7 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -456,6 +456,7 @@ TMH_long_poll_resume (const char *order_id,
.refund_amount = refund_amount,
.obtained = obtained
};
+ int ret;
compute_pay_key (order_id,
&mi->merchant_pub,
@@ -463,13 +464,14 @@ TMH_long_poll_resume (const char *order_id,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Resuming operations suspended pending payment on key %s\n",
GNUNET_h2s (&key));
- GNUNET_CONTAINER_multihashmap_get_multiple (payment_trigger_map,
- &key,
- &resume_operation,
- (void *) &rd);
+ ret = GNUNET_CONTAINER_multihashmap_get_multiple (payment_trigger_map,
+ &key,
+ &resume_operation,
+ (void *) &rd);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "%u operations remain suspended pending payment\n",
- GNUNET_CONTAINER_multihashmap_size (payment_trigger_map));
+ "%u operations remain suspended pending payment (%d)\n",
+ GNUNET_CONTAINER_multihashmap_size (payment_trigger_map),
+ ret);
}
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
b/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
index a940e3c..bcb9aa0 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
@@ -93,6 +93,7 @@ TMH_post_orders_ID_paid (const struct TMH_RequestHandler *rh,
TMH_db->preflight (TMH_db->cls);
{
uint64_t order_serial;
+
qs = TMH_db->lookup_contract_terms (TMH_db->cls,
hc->instance->settings.id,
order_id,
@@ -179,6 +180,13 @@ TMH_post_orders_ID_paid (const struct TMH_RequestHandler
*rh,
NULL);
}
}
+ {
+ // FIXME-#6581: extract fulfillment_url from contract_terms.
+ // IF present, *ALSO* resume long-polling clients for the
+ // same fulfillment URL + session_id!
+ // NOTE: also should do the same in the pay handler!
+ }
+
json_decref (contract_terms);
/* Resume clients waiting on the order */
TMH_long_poll_resume (order_id,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: diagnostics for #6581,
gnunet <=