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

database setup logic is now external to httpd

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-13 14:55:58 +01:00
parent 8d5f42fe0c
commit 9c20b62eb9
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/prebuilt

@ -1 +1 @@
Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5 Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc

8
src/auditordb/plugin_auditordb_postgres.c
View File

@ -37,7 +37,8 @@
* @param field name of the database field to fetch amount from * @param field name of the database field to fetch amount from
* @param[out] amountp pointer to amount to set * @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) field,pg->currency,amountp)
/** /**
@ -62,6 +63,11 @@ struct TALER_AUDITORDB_Session
*/ */
struct GNUNET_PQ_Context *conn; 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; const char *transaction_name;
}; };

4
src/exchange/test_taler_exchange_httpd.sh
View File

@ -29,12 +29,14 @@ PREFIX=
# Uncomment this line to run with valgrind... # Uncomment this line to run with valgrind...
# PREFIX="valgrind --leak-check=yes --track-fds=yes --error-exitcode=1 --log-file=valgrind.%p" # 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. # Setup keys.
taler-exchange-keyup -c test_taler_exchange_httpd.conf || exit 1 taler-exchange-keyup -c test_taler_exchange_httpd.conf || exit 1
# Setup wire accounts. # Setup wire accounts.
taler-exchange-wire -c test_taler_exchange_httpd.conf > /dev/null || exit 1 taler-exchange-wire -c test_taler_exchange_httpd.conf > /dev/null || exit 1
# Run Exchange HTTPD (in background) # 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 # Give HTTP time to start

4
src/exchange/test_taler_exchange_httpd_restart.sh
View File

@ -51,12 +51,14 @@ PREFIX=
# Uncomment this line to run with valgrind... # 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" # 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. # Setup keys.
taler-exchange-keyup -c test_taler_exchange_unix.conf || exit 1 taler-exchange-keyup -c test_taler_exchange_unix.conf || exit 1
# Setup wire accounts. # Setup wire accounts.
taler-exchange-wire -c test_taler_exchange_unix.conf > /dev/null || exit 1 taler-exchange-wire -c test_taler_exchange_unix.conf > /dev/null || exit 1
# Run Exchange HTTPD (in background) # 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? # Where should we be bound to?
UNIXPATH=`taler-config -s exchange -f -o UNIXPATH` UNIXPATH=`taler-config -s exchange -f -o UNIXPATH`