diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-03-24 18:27:24 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-03-24 18:27:24 +0100 |
commit | a3ac2587cfee3c8b6e058d4086eea8f5f297e5af (patch) | |
tree | 61e4e8881d2c7d0952a44f75f08582b852789169 /src/mint/taler-mint-httpd.c | |
parent | ec05a64e3e6346ea91b79244a0a69b06afd22562 (diff) | |
parent | 324bf3f980542cb9f209ee7edc6f142c5c34e5a2 (diff) | |
download | exchange-a3ac2587cfee3c8b6e058d4086eea8f5f297e5af.tar.gz exchange-a3ac2587cfee3c8b6e058d4086eea8f5f297e5af.tar.bz2 exchange-a3ac2587cfee3c8b6e058d4086eea8f5f297e5af.zip |
Merge branch 'master' of git.taler.net:/var/git/mint
Diffstat (limited to 'src/mint/taler-mint-httpd.c')
-rw-r--r-- | src/mint/taler-mint-httpd.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/mint/taler-mint-httpd.c b/src/mint/taler-mint-httpd.c index 416851066..70d3b64f0 100644 --- a/src/mint/taler-mint-httpd.c +++ b/src/mint/taler-mint-httpd.c @@ -31,12 +31,12 @@ #include "taler_util.h" #include "taler-mint-httpd_parsing.h" #include "taler-mint-httpd_mhd.h" -#include "taler-mint-httpd_keys.h" #include "taler-mint-httpd_deposit.h" #include "taler-mint-httpd_withdraw.h" #include "taler-mint-httpd_refresh.h" #include "taler-mint-httpd_keystate.h" -#include "mint_db.h" +#include "taler_mintdb_plugin.h" +#include "plugin.h" /** @@ -230,7 +230,6 @@ mint_serve_process_config (const char *mint_directory) unsigned long long port; unsigned long long kappa; char *master_pub_str; - char *db_cfg; cfg = TALER_config_load (mint_directory); if (NULL == cfg) @@ -261,16 +260,7 @@ mint_serve_process_config (const char *mint_directory) GNUNET_free (master_pub_str); if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "mint", "db", - &db_cfg)) - { - fprintf (stderr, - "invalid configuration: mint.db\n"); - return GNUNET_NO; - } - if (GNUNET_OK != - TALER_MINT_DB_init (db_cfg)) + TALER_MINT_plugin_load (cfg)) { fprintf (stderr, "failed to initialize DB subsystem\n"); |