merchant

commit 287527d0da1777dd1c256ef01e87f43631b6b1d4
parent 51dceb0ed3febf68d80faf0a5ddab6e75b60892d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 23 Aug 2021 00:03:04 +0200

-update to match latest GNUnet APIs

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
1
+
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
3
+++
M
src/include/taler_merchantdb_plugin.h
 | 
2
++

3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -2214,6 +2214,7 @@ run (void *cls,
 
     instance_eh = TMH_db->event_listen (TMH_db->cls,
                                         &es,
+                                        GNUNET_TIME_UNIT_FOREVER_REL,
                                         &load_instances,
                                         NULL);
   }
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -158,6 +158,7 @@ postgres_create_tables (void *cls)
  *
  * @param cls database context to use
  * @param es specification of the event to listen for
+ * @param timeout how long to wait for the event
  * @param cb function to call when the event happens, possibly
  *         multiple times (until cancel is invoked)
  * @param cb_cls closure for @a cb
@@ -166,6 +167,7 @@ postgres_create_tables (void *cls)
 static struct GNUNET_DB_EventHandler *
 postgres_event_listen (void *cls,
                        const struct GNUNET_DB_EventHeaderP *es,
+                       struct GNUNET_TIME_Relative timeout,
                        GNUNET_DB_EventCallback cb,
                        void *cb_cls)
 {
@@ -173,6 +175,7 @@ postgres_event_listen (void *cls,
 
   return GNUNET_PQ_event_listen (pg->conn,
                                  es,
+                                 timeout,
                                  cb,
                                  cb_cls);
 }
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
@@ -721,6 +721,7 @@ struct TALER_MERCHANTDB_Plugin
    *
    * @param cls database context to use
    * @param es specification of the event to listen for
+   * @param timeout how long to wait for the event
    * @param cb function to call when the event happens, possibly
    *         multiple times (until cancel is invoked)
    * @param cb_cls closure for @a cb
@@ -729,6 +730,7 @@ struct TALER_MERCHANTDB_Plugin
   struct GNUNET_DB_EventHandler *
   (*event_listen)(void *cls,
                   const struct GNUNET_DB_EventHeaderP *es,
+                  struct GNUNET_TIME_Relative timeout,
                   GNUNET_DB_EventCallback cb,
                   void *cb_cls);