diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-06-20 14:28:00 +0200 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-06-20 14:28:00 +0200 |
commit | 480d1ea4ba7e9c6ec8107e6334124d5bbd1a7c13 (patch) | |
tree | 4cdf8505ab21d0f95e3f011762a9201b8a076dcd /src | |
parent | 141807f89eda581f181fd414f46a285841f592a3 (diff) | |
download | merchant-480d1ea4ba7e9c6ec8107e6334124d5bbd1a7c13.tar.gz merchant-480d1ea4ba7e9c6ec8107e6334124d5bbd1a7c13.tar.bz2 merchant-480d1ea4ba7e9c6ec8107e6334124d5bbd1a7c13.zip |
Up to the point where /refund (increase) passes BUT db hangs upon
dropping tables..
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/taler-merchant-httpd_refund.c | 2 | ||||
-rw-r--r-- | src/lib/merchant_api_refund.c | 1 | ||||
-rw-r--r-- | src/lib/test_merchant_api.c | 24 |
3 files changed, 17 insertions, 10 deletions
diff --git a/src/backend/taler-merchant-httpd_refund.c b/src/backend/taler-merchant-httpd_refund.c index f8f40aff..2504333e 100644 --- a/src/backend/taler-merchant-httpd_refund.c +++ b/src/backend/taler-merchant-httpd_refund.c @@ -281,7 +281,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh, return TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_OK, - "{s:s}", + "{s:o}", "sig", GNUNET_JSON_from_data_auto (&sig)); } diff --git a/src/lib/merchant_api_refund.c b/src/lib/merchant_api_refund.c index f0cf99c0..692cab7e 100644 --- a/src/lib/merchant_api_refund.c +++ b/src/lib/merchant_api_refund.c @@ -144,6 +144,7 @@ handle_refund_increase_finished (void *cls, code, hint); } + TALER_MERCHANT_refund_increase_cancel (rio); } /** diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index b7383b21..99f278a7 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -833,10 +833,6 @@ history_cb (void *cls, fail (is); return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "/history data: %s\n", - json_dumps (json, JSON_INDENT (1))); - next_command (is); } @@ -1148,6 +1144,11 @@ refund_increase_cb (void *cls, const json_t *obj) { struct InterpreterState *is = cls; + struct Command *cmd = &is->commands[is->ip]; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "/refund (increase) response object: %s\n", + json_dumps (obj, JSON_INDENT (2))); if (MHD_HTTP_OK != http_status) { @@ -1156,6 +1157,8 @@ refund_increase_cb (void *cls, fail (is); return; } + cmd->details.refund_increase.rio = NULL; + next_command (is); } /** @@ -1314,10 +1317,6 @@ track_transfer_cb (void *cls, struct InterpreterState *is = cls; struct Command *cmd = &is->commands[is->ip]; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Tracked transfers: '%s'.\n", - json_dumps (json, JSON_INDENT (1))); - cmd->details.track_transfer.tdo = NULL; if (cmd->expected_response_code != http_status) { @@ -1592,6 +1591,8 @@ cleanup_state (struct InterpreterState *is) case OC_REFUND_INCREASE: if (NULL != cmd->details.refund_increase.rio) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cleaning up /refund (increase)\n"); TALER_MERCHANT_refund_increase_cancel (cmd->details.refund_increase.rio); cmd->details.refund_increase.rio = NULL; } @@ -2152,7 +2153,7 @@ interpreter_run (void *cls) cmd->details.refund_increase.reason, instance, refund_increase_cb, - NULL))) + is))) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not issue a /refund increase request\n"); @@ -2205,6 +2206,7 @@ do_shutdown (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown executing\n"); cleanup_state (is); + if (NULL != is->task) { GNUNET_SCHEDULER_cancel (is->task); @@ -2232,7 +2234,11 @@ do_shutdown (void *cls) TALER_FAKEBANK_stop (fakebank); fakebank = NULL; + /** + * WARNING: hangs when attempting to drop tables. + */ db->drop_tables (db->cls); + TALER_MERCHANTDB_plugin_unload (db); GNUNET_CONFIGURATION_destroy (cfg); } |