[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -fix pay long polling
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: -fix pay long polling |
Date: |
Mon, 23 Jan 2023 17:51:42 +0100 |
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 6571d719 -fix pay long polling
6571d719 is described below
commit 6571d7192f2952ecc62d2dd55c322d2293f6cb2c
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jan 23 17:51:37 2023 +0100
-fix pay long polling
---
src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 162ee97a..957bfdfa 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -254,7 +254,7 @@ struct PayContext
* Our contract (or NULL if not available).
*/
json_t *contract_terms;
-
+
/**
* Placeholder for #TALER_MHD_parse_post_json() to keep its internal state.
*/
@@ -1045,7 +1045,7 @@ handle_batch_deposit_ok (struct ExchangeGroup *eg,
{
resume_pay_with_error (pc,
MHD_HTTP_INTERNAL_SERVER_ERROR,
- TALER_EC_GENERIC_DB_SOFT_FAILURE,
+ TALER_EC_GENERIC_DB_SOFT_FAILURE,
"insert_deposit");
return;
}
@@ -1881,7 +1881,7 @@ check_payment_sufficient (struct PayContext *pc)
*
* @param pc context to trigger notification for
*/
-static enum GNUNET_DB_QueryStatus
+static void
trigger_payment_notification (struct PayContext *pc)
{
{
@@ -1926,9 +1926,6 @@ trigger_payment_notification (struct PayContext *pc)
NULL,
0);
}
- return TMH_trigger_webhook (pc->hc->instance->settings.id,
- "pay",
- pc->contract_terms);
}
@@ -2116,8 +2113,10 @@ execute_pay_transaction (struct PayContext *pc)
pc->order_serial);
{
enum GNUNET_DB_QueryStatus qs;
-
- qs = trigger_payment_notification (pc);
+
+ qs = TMH_trigger_webhook (pc->hc->instance->settings.id,
+ "pay",
+ pc->contract_terms);
if (qs < 0)
{
TMH_db->rollback (TMH_db->cls);
@@ -2155,6 +2154,7 @@ execute_pay_transaction (struct PayContext *pc)
NULL);
return;
}
+ trigger_payment_notification (pc);
}
generate_success_response (pc);
}
--
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: -fix pay long polling,
gnunet <=