summaryrefslogtreecommitdiff
path: root/src/backend/taler-merchant-httpd_exchanges.c
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-19 01:42:35 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-04-19 01:42:35 +0200
commit23d94a0dcca6c061a41eaf2505b2b79dd0f39af4 (patch)
tree1e9e44c4fe6973472cce8470d1b5f80ecb661743 /src/backend/taler-merchant-httpd_exchanges.c
parent0d58876d7f521385b12859de3d3f0d25082b7fc2 (diff)
downloadmerchant-23d94a0dcca6c061a41eaf2505b2b79dd0f39af4.tar.gz
merchant-23d94a0dcca6c061a41eaf2505b2b79dd0f39af4.tar.bz2
merchant-23d94a0dcca6c061a41eaf2505b2b79dd0f39af4.zip
Decrease exchange retry timeout, notify clients correctly.
Diffstat (limited to 'src/backend/taler-merchant-httpd_exchanges.c')
-rw-r--r--src/backend/taler-merchant-httpd_exchanges.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
index b1da8a02..97886a47 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -27,7 +27,7 @@
/**
* How often do we retry fetching /keys?
*/
-#define KEYS_RETRY_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 60)
+#define KEYS_RETRY_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
/**
@@ -385,13 +385,10 @@ TMH_EXCHANGES_find_exchange (const char *chosen_exchange,
exchange->fo_tail,
fo);
- if (GNUNET_NO == exchange->pending)
+ if (GNUNET_OK != exchange->pending)
{
/* We are not currently waiting for a reply, immediately
return result */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Exchange `%s' already contacted\n",
- chosen_exchange);
fo->at = GNUNET_SCHEDULER_add_now (&return_result,
fo);
return fo;