[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: database setup logic is now exte
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: database setup logic is now external to httpd |
Date: |
Fri, 13 Mar 2020 14:56:01 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 9c20b62e database setup logic is now external to httpd
9c20b62e is described below
commit 9c20b62eb965c2b8a9e94f56283d5671e37bc447
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Mar 13 14:55:58 2020 +0100
database setup logic is now external to httpd
---
doc/prebuilt | 2 +-
src/auditordb/plugin_auditordb_postgres.c | 8 +++++++-
src/exchange/test_taler_exchange_httpd.sh | 4 +++-
src/exchange/test_taler_exchange_httpd_restart.sh | 4 +++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/doc/prebuilt b/doc/prebuilt
index ca53235c..934a6a18 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5
+Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc
diff --git a/src/auditordb/plugin_auditordb_postgres.c
b/src/auditordb/plugin_auditordb_postgres.c
index 4515e779..2f1b5234 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -37,7 +37,8 @@
* @param field name of the database field to fetch amount from
* @param[out] amountp pointer to amount to set
*/
-#define TALER_PQ_RESULT_SPEC_AMOUNT(field,amountp) TALER_PQ_result_spec_amount
( \
+#define TALER_PQ_RESULT_SPEC_AMOUNT(field,amountp) \
+ TALER_PQ_result_spec_amount ( \
field,pg->currency,amountp)
/**
@@ -62,6 +63,11 @@ struct TALER_AUDITORDB_Session
*/
struct GNUNET_PQ_Context *conn;
+ /**
+ * Name of the ongoing transaction, used to debug cases where
+ * a transaction is not properly terminated via COMMIT or
+ * ROLLBACK.
+ */
const char *transaction_name;
};
diff --git a/src/exchange/test_taler_exchange_httpd.sh
b/src/exchange/test_taler_exchange_httpd.sh
index 2ff5830d..dabe79cb 100755
--- a/src/exchange/test_taler_exchange_httpd.sh
+++ b/src/exchange/test_taler_exchange_httpd.sh
@@ -29,12 +29,14 @@ PREFIX=
# Uncomment this line to run with valgrind...
# PREFIX="valgrind --leak-check=yes --track-fds=yes --error-exitcode=1
--log-file=valgrind.%p"
+# Setup database
+taler-exchange-dbinit -c test_taler_exchange_httpd.conf &> /dev/null
# Setup keys.
taler-exchange-keyup -c test_taler_exchange_httpd.conf || exit 1
# Setup wire accounts.
taler-exchange-wire -c test_taler_exchange_httpd.conf > /dev/null || exit 1
# Run Exchange HTTPD (in background)
-$PREFIX taler-exchange-httpd -c test_taler_exchange_httpd.conf -i 2>
test-exchange.log &
+$PREFIX taler-exchange-httpd -c test_taler_exchange_httpd.conf 2>
test-exchange.log &
# Give HTTP time to start
diff --git a/src/exchange/test_taler_exchange_httpd_restart.sh
b/src/exchange/test_taler_exchange_httpd_restart.sh
index f7d7a305..a8976fb0 100755
--- a/src/exchange/test_taler_exchange_httpd_restart.sh
+++ b/src/exchange/test_taler_exchange_httpd_restart.sh
@@ -51,12 +51,14 @@ PREFIX=
# Uncomment this line to run with valgrind...
# PREFIX="valgrind --trace-children=yes --leak-check=yes --track-fds=yes
--error-exitcode=1 --log-file=valgrind.%p"
+# Setup database
+taler-exchange-dbinit -c test_taler_exchange_unix.conf &> /dev/null
# Setup keys.
taler-exchange-keyup -c test_taler_exchange_unix.conf || exit 1
# Setup wire accounts.
taler-exchange-wire -c test_taler_exchange_unix.conf > /dev/null || exit 1
# Run Exchange HTTPD (in background)
-$PREFIX taler-exchange-httpd -c test_taler_exchange_unix.conf -i 2>
test-exchange.log &
+$PREFIX taler-exchange-httpd -c test_taler_exchange_unix.conf 2>
test-exchange.log &
# Where should we be bound to?
UNIXPATH=`taler-config -s exchange -f -o UNIXPATH`
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: database setup logic is now external to httpd,
gnunet <=