diff options
| author | Florian Dold <dold@inria.fr> | 2015-12-25 18:52:42 +0100 |
|---|---|---|
| committer | Florian Dold <dold@inria.fr> | 2015-12-25 18:52:42 +0100 |
| commit | 6d4c9ea21342dcf547ddfeccd43a6371a1b6f931 (patch) | |
| tree | b1d69c19f263e6f2a125d6f54923f95f8d20ed12 | |
| parent | b25d59dcbf1444b5e2c803992b786ba7399a5801 (diff) | |
| download | merchant-6d4c9ea21342dcf547ddfeccd43a6371a1b6f931.tar.gz merchant-6d4c9ea21342dcf547ddfeccd43a6371a1b6f931.tar.bz2 merchant-6d4c9ea21342dcf547ddfeccd43a6371a1b6f931.zip | |
Add lots of logging.
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 1 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 24 |
2 files changed, 22 insertions, 3 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 21fd545a..da4f6e8d 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -469,6 +469,7 @@ prepare_daemon () tv = GNUNET_TIME_UNIT_FOREVER_REL; GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1); GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding run_daemon select task\n"); ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH, tv, wrs, wws, diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 67166eaf..eb5133ac 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -468,7 +468,10 @@ process_pay_with_mint (void *cls, /* fee higher than residual coin value, makes no sense. */ resume_pay_with_response (pc, MHD_HTTP_BAD_REQUEST, - TMH_RESPONSE_make_internal_error ("Fee higher than coin value")); + TMH_RESPONSE_make_json_pack ("{s:s, s:o, s:o}", + "hint", "fee higher than coin value", + "f", TALER_json_from_amount (&dc->percoin_amount), + "fee_deposit", TALER_json_from_amount (&denom_details->fee_deposit))); return; } } @@ -547,8 +550,9 @@ process_pay_with_mint (void *cls, * we'd get that information in the callback. */ resume_pay_with_response (pc, MHD_HTTP_UNAUTHORIZED, - TMH_RESPONSE_make_json_pack ("{s:s}", - "hint", "Coin signature invalid.")); + TMH_RESPONSE_make_json_pack ("{s:s, s:i}", + "hint", "Coin signature invalid.", + "coin_idx", i)); return; } } @@ -685,6 +689,11 @@ MH_handler_pay (struct TMH_RequestHandler *rh, pc->dc = GNUNET_new_array (pc->coins_cnt, struct MERCHANT_DepositConfirmation); + { + char *s = json_dumps (coins, JSON_INDENT(2)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Coins json is: %s\n", s); + } + json_array_foreach (coins, coins_index, coin) { struct MERCHANT_DepositConfirmation *dc = &pc->dc[coins_index]; @@ -705,6 +714,15 @@ MH_handler_pay (struct TMH_RequestHandler *rh, json_decref (root); return (GNUNET_NO == res) ? MHD_YES : MHD_NO; } + + { + char *s; + s = TALER_amount_to_string (&dc->percoin_amount); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Coin #%i has f %s\n", coins_index, s); + GNUNET_free (s); + } + dc->index = coins_index; dc->pc = pc; } |