[taler-merchant] branch master updated: possible fix for #6835

[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 4f8cb89a possible fix for #6835
4f8cb89a is described below

commit 4f8cb89a52858d646e1355f9c1c4f97ee77a4365
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Apr 8 12:01:09 2021 +0200

    possible fix for #6835
---
 src/backend/taler-merchant-httpd_exchanges.c | 6 ++++++
 src/include/taler_merchant_service.h         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_exchanges.c 
b/src/backend/taler-merchant-httpd_exchanges.c
index 5cdc5643..da093160 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -974,6 +974,12 @@ keys_mgmt_cb (void *cls,
     delay = RELOAD_DELAY;
   else
     delay = GNUNET_TIME_absolute_get_remaining (expire);
+  if (0 == delay.rel_value_us)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "/keys response from exchange expired immediately! Retrying in 
1 minute.\n");
+    delay = GNUNET_TIME_UNIT_MINUTES;
+  }
   exchange->retry_delay = GNUNET_TIME_UNIT_ZERO;
   if (NULL != exchange->retry_task)
     GNUNET_SCHEDULER_cancel (exchange->retry_task);
diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index 76f8bc66..67f544e9 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -194,7 +194,7 @@ TALER_MERCHANT_parse_pay_uri (const char *pay_uri,
 /**
  * Frees data contained in the result of parsing a taler://pay URI.
  *
- * @param parse_data the data to free.
+ * @param[in] parse_data the data to free.
  */
 void
 TALER_MERCHANT_parse_pay_uri_free (

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