diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-06-20 18:22:33 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-06-20 18:22:33 +0200 |
| commit | da5f393967e9a4e6b7c78b72f1c9f74a49bb52c6 (patch) | |
| tree | 95e94f74d7c9661865a5dfe11c73fdc16147a188 /src/backend/taler-merchant-httpd.c | |
| parent | 9bae03573f31f22893839bbbbdaeba94821e3a57 (diff) | |
| download | merchant-da5f393967e9a4e6b7c78b72f1c9f74a49bb52c6.tar.gz merchant-da5f393967e9a4e6b7c78b72f1c9f74a49bb52c6.tar.bz2 merchant-da5f393967e9a4e6b7c78b72f1c9f74a49bb52c6.zip | |
start with reserve processing logic
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 804e10e1..f3d8d757 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -59,7 +59,7 @@ #include "taler-merchant-httpd_post-orders-ID-claim.h" #include "taler-merchant-httpd_post-orders-ID-pay.h" #include "taler-merchant-httpd_post-tips-ID-pickup.h" - +#include "taler-merchant-httpd_reserves.h" /** * Backlog for listen operation on unix-domain sockets. @@ -472,6 +472,7 @@ do_shutdown (void *cls) MHD_stop_daemon (mhd); mhd = NULL; } + TMH_RESERVES_done (); if (NULL != TMH_db) { TALER_MERCHANTDB_plugin_unload (TMH_db); @@ -1361,6 +1362,11 @@ run (void *cls, result = GNUNET_SYSERR; GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); + resume_timeout_heap + = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); + payment_trigger_map + = GNUNET_CONTAINER_multihashmap_create (16, + GNUNET_YES); if (GNUNET_OK != TALER_config_get_currency (cfg, &TMH_currency)) @@ -1425,7 +1431,8 @@ run (void *cls, return; } } - + /* start watching reserves */ + TMH_RESERVES_init (); fh = TALER_MHD_bind (cfg, "merchant", &port); @@ -1435,11 +1442,6 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } - resume_timeout_heap - = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); - payment_trigger_map - = GNUNET_CONTAINER_multihashmap_create (16, - GNUNET_YES); mhd = MHD_start_daemon (MHD_USE_SUSPEND_RESUME | MHD_USE_DUAL_STACK, port, NULL, NULL, |