summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-11-23 22:26:11 +0100
committerChristian Grothoff <christian@grothoff.org>2019-11-23 22:26:27 +0100
commit7510b6310b59967a21e3683a13b8232179f7b26a (patch)
tree955bdec67f62bf909b0f70abb2260687baecac09
parent7aae6c90452c1e9bcae78a5e948f381c1165010a (diff)
downloadexchange-7510b6310b59967a21e3683a13b8232179f7b26a.tar.gz
exchange-7510b6310b59967a21e3683a13b8232179f7b26a.tar.bz2
exchange-7510b6310b59967a21e3683a13b8232179f7b26a.zip
more libtalermhd migration
-rw-r--r--src/auditor/taler-auditor-httpd.c7
-rw-r--r--src/auditor/taler-auditor-httpd_db.c27
-rw-r--r--src/auditor/taler-auditor-httpd_deposit-confirmation.c1
-rw-r--r--src/auditor/taler-auditor-httpd_exchanges.c1
-rw-r--r--src/auditor/taler-auditor-httpd_mhd.c14
5 files changed, 27 insertions, 23 deletions
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c
index bf1e7ac7..55a34377 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -31,7 +31,6 @@
#include "taler_auditordb_lib.h"
#include "taler-auditor-httpd_deposit-confirmation.h"
#include "taler-auditor-httpd_exchanges.h"
-#include "taler-auditor-httpd_responses.h"
#include "taler-auditor-httpd_mhd.h"
#include "taler-auditor-httpd.h"
@@ -332,9 +331,9 @@ handle_version (struct TAH_RequestHandler *rh,
GNUNET_break (0);
return MHD_NO;
}
- return TAH_RESPONSE_reply_json (connection,
- ver,
- MHD_HTTP_OK);
+ return TALER_MHD_reply_json (connection,
+ ver,
+ MHD_HTTP_OK);
}
diff --git a/src/auditor/taler-auditor-httpd_db.c b/src/auditor/taler-auditor-httpd_db.c
index e0ab8f2e..3433e9a9 100644
--- a/src/auditor/taler-auditor-httpd_db.c
+++ b/src/auditor/taler-auditor-httpd_db.c
@@ -23,8 +23,9 @@
#include <jansson.h>
#include <gnunet/gnunet_json_lib.h>
#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
#include "taler-auditor-httpd_db.h"
-#include "taler-auditor-httpd_responses.h"
+#include "taler-auditor-httpd.h"
/**
@@ -63,8 +64,10 @@ TAH_DB_run_transaction (struct MHD_Connection *connection,
{
GNUNET_break (0);
if (NULL != mhd_ret)
- *mhd_ret = TAH_RESPONSE_reply_internal_db_error (connection,
- TALER_EC_DB_SETUP_FAILED);
+ *mhd_ret = TALER_MHD_reply_with_error (connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR,
+ TALER_EC_DB_SETUP_FAILED,
+ "failed to establish session with database");
return GNUNET_SYSERR;
}
// TAH_plugin->preflight (TAH_plugin->cls, session); // FIXME: needed?
@@ -79,8 +82,10 @@ TAH_DB_run_transaction (struct MHD_Connection *connection,
{
GNUNET_break (0);
if (NULL != mhd_ret)
- *mhd_ret = TAH_RESPONSE_reply_internal_db_error (connection,
- TALER_EC_DB_START_FAILED);
+ *mhd_ret = TALER_MHD_reply_with_error (connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR,
+ TALER_EC_DB_START_FAILED,
+ "failed to begin transaction");
return GNUNET_SYSERR;
}
qs = cb (cb_cls,
@@ -98,8 +103,10 @@ TAH_DB_run_transaction (struct MHD_Connection *connection,
if (GNUNET_DB_STATUS_HARD_ERROR == qs)
{
if (NULL != mhd_ret)
- *mhd_ret = TAH_RESPONSE_reply_commit_error (connection,
- TALER_EC_DB_COMMIT_FAILED_HARD);
+ *mhd_ret = TALER_MHD_reply_with_error (connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR,
+ TALER_EC_DB_COMMIT_FAILED_HARD,
+ "failed to commit transaction");
return GNUNET_SYSERR;
}
/* make sure callback did not violate invariants! */
@@ -112,8 +119,10 @@ TAH_DB_run_transaction (struct MHD_Connection *connection,
name,
MAX_TRANSACTION_COMMIT_RETRIES);
if (NULL != mhd_ret)
- *mhd_ret = TAH_RESPONSE_reply_commit_error (connection,
- TALER_EC_DB_COMMIT_FAILED_ON_RETRY);
+ *mhd_ret = TALER_MHD_reply_with_error (connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR,
+ TALER_EC_DB_COMMIT_FAILED_ON_RETRY,
+ "transaction repeatedly failed to serialize");
return GNUNET_SYSERR;
}
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
index 23ea14a9..0a121fda 100644
--- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c
+++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
@@ -31,7 +31,6 @@
#include "taler-auditor-httpd.h"
#include "taler-auditor-httpd_db.h"
#include "taler-auditor-httpd_deposit-confirmation.h"
-#include "taler-auditor-httpd_responses.h"
/**
diff --git a/src/auditor/taler-auditor-httpd_exchanges.c b/src/auditor/taler-auditor-httpd_exchanges.c
index 27b33963..3c6bfe68 100644
--- a/src/auditor/taler-auditor-httpd_exchanges.c
+++ b/src/auditor/taler-auditor-httpd_exchanges.c
@@ -29,7 +29,6 @@
#include "taler-auditor-httpd.h"
#include "taler-auditor-httpd_db.h"
#include "taler-auditor-httpd_exchanges.h"
-#include "taler-auditor-httpd_responses.h"
/**
diff --git a/src/auditor/taler-auditor-httpd_mhd.c b/src/auditor/taler-auditor-httpd_mhd.c
index 6613ddb0..ca87b8da 100644
--- a/src/auditor/taler-auditor-httpd_mhd.c
+++ b/src/auditor/taler-auditor-httpd_mhd.c
@@ -29,8 +29,6 @@
#include <microhttpd.h>
#include <pthread.h>
#include "taler_mhd_lib.h"
-#include "taler-auditor-httpd_responses.h"
-#include "taler-auditor-httpd_responses.h"
#include "taler-auditor-httpd.h"
#include "taler-auditor-httpd_mhd.h"
@@ -65,7 +63,7 @@ TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh,
GNUNET_break (0);
return MHD_NO;
}
- TAH_RESPONSE_add_global_headers (response);
+ TALER_MHD_add_global_headers (response);
if (NULL != rh->mime_type)
(void) MHD_add_response_header (response,
MHD_HTTP_HEADER_CONTENT_TYPE,
@@ -123,11 +121,11 @@ TAH_MHD_handler_send_json_pack_error (struct TAH_RequestHandler *rh,
const char *upload_data,
size_t *upload_data_size)
{
- return TAH_RESPONSE_reply_json_pack (connection,
- rh->response_code,
- "{s:s}",
- "error",
- rh->data);
+ return TALER_MHD_reply_json_pack (connection,
+ rh->response_code,
+ "{s:s}",
+ "error",
+ rh->data);
}