diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-09-09 16:56:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-09-09 16:56:26 +0200 |
commit | 374ef1e098a57a801ed1e1735aec573bc425cc6e (patch) | |
tree | 7dd4423cb679f9bc93481f44ce7b9878c30b74b4 | |
parent | e4e24b5b62ca01e431868afac06bcd548ee69d2b (diff) | |
download | merchant-374ef1e098a57a801ed1e1735aec573bc425cc6e.tar.gz merchant-374ef1e098a57a801ed1e1735aec573bc425cc6e.tar.bz2 merchant-374ef1e098a57a801ed1e1735aec573bc425cc6e.zip |
diagnostics for #6581
-rw-r--r-- | src/backend/taler-merchant-httpd.c | 14 | ||||
-rw-r--r-- | 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 7104b954..22e11d74 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 a940e3cd..bcb9aa07 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, |