taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more refactoring for libtalermhd

Browse Source
This commit is contained in:
Christian Grothoff 2019-11-23 21:06:25 +01:00
parent cf6ba0c771
commit 8f006e779e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/exchange/taler-exchange-httpd_db.c
View File

@ -23,6 +23,7 @@
#include <jansson.h> #include <jansson.h>
#include <gnunet/gnunet_json_lib.h> #include <gnunet/gnunet_json_lib.h>
#include "taler_json_lib.h" #include "taler_json_lib.h"
#include "taler_mhd_lib.h"
#include "taler-exchange-httpd_responses.h" #include "taler-exchange-httpd_responses.h"
#include "taler-exchange-httpd_keystate.h" #include "taler-exchange-httpd_keystate.h"
@ -62,8 +63,10 @@ TEH_DB_know_coin_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
{ {
*mhd_ret *mhd_ret
= TEH_RESPONSE_reply_internal_db_error (connection, = TALER_MHD_reply_with_error (connection,
TALER_EC_DB_COIN_HISTORY_STORE_ERROR); MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_COIN_HISTORY_STORE_ERROR,
"could not persist coin data");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
return qs; return qs;
@ -99,8 +102,10 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
{ {
GNUNET_break (0); GNUNET_break (0);
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TEH_RESPONSE_reply_internal_db_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
TALER_EC_DB_SETUP_FAILED); MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_SETUP_FAILED,
"could not establish database session");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
TEH_plugin->preflight (TEH_plugin->cls, TEH_plugin->preflight (TEH_plugin->cls,
@ -117,8 +122,10 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
{ {
GNUNET_break (0); GNUNET_break (0);
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TEH_RESPONSE_reply_internal_db_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
TALER_EC_DB_START_FAILED); MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_START_FAILED,
"could not begin transaction");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
qs = cb (cb_cls, qs = cb (cb_cls,
@ -136,8 +143,10 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
{ {
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TEH_RESPONSE_reply_commit_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
TALER_EC_DB_COMMIT_FAILED_HARD); MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_COMMIT_FAILED_HARD,
"could not commit database transaction");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
/* make sure callback did not violate invariants! */ /* make sure callback did not violate invariants! */
@ -150,8 +159,10 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
name, name,
MAX_TRANSACTION_COMMIT_RETRIES); MAX_TRANSACTION_COMMIT_RETRIES);
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TEH_RESPONSE_reply_commit_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
TALER_EC_DB_COMMIT_FAILED_ON_RETRY); MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_COMMIT_FAILED_ON_RETRY,
"repatedly failed to serialize database transaction");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }

6
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -1243,7 +1243,7 @@ setup_general_response_headers (const struct TEH_KS_StateHandle *key_state,
{ {
char dat[128]; char dat[128];
TEH_RESPONSE_add_global_headers (response); TALER_MHD_add_global_headers (response);
GNUNET_break (MHD_YES == GNUNET_break (MHD_YES ==
MHD_add_response_header (response, MHD_add_response_header (response,
MHD_HTTP_HEADER_CONTENT_TYPE, MHD_HTTP_HEADER_CONTENT_TYPE,
@ -1546,8 +1546,8 @@ build_keys_response (const struct ResponseFactoryContext *rfc,
} }
/* Also compute compressed version of /keys response */ /* Also compute compressed version of /keys response */
comp = TEH_RESPONSE_body_compress (&keys_jsonz, comp = TALER_MHD_body_compress (&keys_jsonz,
&keys_jsonz_size); &keys_jsonz_size);
krd->response_compressed krd->response_compressed
= MHD_create_response_from_buffer (keys_jsonz_size, = MHD_create_response_from_buffer (keys_jsonz_size,
keys_jsonz, keys_jsonz,