summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-04-08 12:01:09 +0200
committerChristian Grothoff <christian@grothoff.org>2021-04-08 12:01:09 +0200
commit4f8cb89a52858d646e1355f9c1c4f97ee77a4365 (patch)
tree4ffbd845a2c6a7f9e83828e7b1f7988b416aadb5 /src
parent1e10f069f6e808929386113fef992ded67d43d88 (diff)
downloadmerchant-4f8cb89a52858d646e1355f9c1c4f97ee77a4365.tar.gz
merchant-4f8cb89a52858d646e1355f9c1c4f97ee77a4365.tar.bz2
merchant-4f8cb89a52858d646e1355f9c1c4f97ee77a4365.zip
possible fix for #6835
Diffstat (limited to 'src')
-rw-r--r--src/backend/taler-merchant-httpd_exchanges.c6
-rw-r--r--src/include/taler_merchant_service.h2
2 files changed, 7 insertions, 1 deletions
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 (