diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-11-27 21:03:37 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-11-27 21:03:37 +0100 |
| commit | f46a22ebb9cc7308ed3bffcbb5227795552a08fb (patch) | |
| tree | 99459be5549ad376071342dea573c6994c409514 /src/backend/taler-merchant-httpd.c | |
| parent | cd1bc15c6cc942be27db20ab3ab5ba76eb90849a (diff) | |
| download | merchant-f46a22ebb9cc7308ed3bffcbb5227795552a08fb.tar.gz merchant-f46a22ebb9cc7308ed3bffcbb5227795552a08fb.tar.bz2 merchant-f46a22ebb9cc7308ed3bffcbb5227795552a08fb.zip | |
use new pluggable db backend, fixes FTBFS
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index ffa81a7d..2cc553e9 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -107,7 +107,7 @@ static int result; /** * Connection handle to the our database */ -PGconn *db_conn; +struct TALER_MERCHANTDB_Plugin *db; /** * The MHD Daemon @@ -241,10 +241,10 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) MHD_stop_daemon (mhd); mhd = NULL; } - if (NULL != db_conn) + if (NULL != db) { - TALER_MERCHANTDB_disconnect (db_conn); - db_conn = NULL; + TALER_MERCHANTDB_plugin_unload (db); + db = NULL; } TMH_MINTS_done (); TMH_AUDITORS_done (); @@ -505,9 +505,9 @@ run (void *cls, GNUNET_CRYPTO_eddsa_key_get_public (privkey, &pubkey.eddsa_pub); EXITIF (NULL == - (db_conn = TALER_MERCHANTDB_connect (config))); + (db = TALER_MERCHANTDB_plugin_load (config))); EXITIF (GNUNET_OK != - TALER_MERCHANTDB_initialize (db_conn, dry)); + db->initialize (db->cls, dry)); EXITIF (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (config, "merchant", |