diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_exchanges.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_exchanges.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index be29cfcc..b74ae211 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -505,7 +505,7 @@ process_wire_accounts (struct Exchange *exchange, * @param wire_method the wire method we want the fees for * @return NULL if we do not have fees for this method yet */ -static struct FeesByWireMethod * +static const struct FeesByWireMethod * get_wire_fees (struct Exchange *exchange, struct GNUNET_TIME_Timestamp now, const char *wire_method) @@ -559,7 +559,7 @@ process_find_operations (struct Exchange *exchange) NULL != fo; fo = fn) { - struct FeesByWireMethod *fbw; + const struct FeesByWireMethod *fbw; fn = fo->next; if (NULL != fo->wire_method) @@ -571,6 +571,10 @@ process_find_operations (struct Exchange *exchange) if (NULL == fbw) { need_wire = true; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Missing wire fees for exchange %s and method %s\n", + exchange->url, + fo->wire_method); /* Do not warn if this is before our first attempt */ if (! GNUNET_TIME_relative_is_zero (exchange->wire_retry_delay)) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, @@ -656,6 +660,8 @@ handle_wire_data (void *cls, enum TALER_ErrorCode ecx; exchange->wire_request = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Received /wire response\n"); if (MHD_HTTP_OK != hr->http_status) { struct TMH_EXCHANGES_FindOperation *fo; @@ -752,6 +758,8 @@ wire_task_cb (void *cls) if (! process_find_operations (exchange)) return; /* no more need */ GNUNET_assert (NULL == exchange->wire_request); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Initiating /wire download\n"); exchange->wire_request = TALER_EXCHANGE_wire (exchange->conn, &handle_wire_data, exchange); @@ -1118,8 +1126,13 @@ TMH_EXCHANGES_find_exchange (const char *chosen_exchange, = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_max ( exchange->retry_delay, FORCED_RELOAD_DELAY)); - TALER_EXCHANGE_check_keys_current (exchange->conn, - TALER_EXCHANGE_CKF_FORCE_DOWNLOAD); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "/keys retry forced, waiting until %s\n", + GNUNET_TIME_absolute2s (exchange->first_retry)); + /* NOTE: return value tells us how long /keys should still + be valid. */ + (void) TALER_EXCHANGE_check_keys_current (exchange->conn, + TALER_EXCHANGE_CKF_FORCE_DOWNLOAD); return fo; } @@ -1156,7 +1169,7 @@ TMH_EXCHANGES_find_exchange (const char *chosen_exchange, (NULL == exchange->wire_task) && (NULL == exchange->wire_request) ) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Do not have required wire data. Will re-request /wire now\n"); exchange->wire_task = GNUNET_SCHEDULER_add_now (&wire_task_cb, exchange); |