sync

commit 88bc94d96f9b8460f5a3c33135ed0fe7765b7988
parent efaff574fc9a7e2cf51a05e536c4d77e140f0b86
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 15 Nov 2024 13:28:51 +0100

-fix configuration, handle plugin load failure better

Diffstat:
M
src/syncdb/plugin_syncdb_postgres.c
 | 
4
++--
M
src/syncdb/sync_db_plugin.c
 | 
8
+++++---
M
src/syncdb/test_sync_db_postgres.conf
 | 
2
+-
M
src/testing/test_sync_api.conf
 | 
1
+

4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/syncdb/plugin_syncdb_postgres.c b/src/syncdb/plugin_syncdb_postgres.c
@@ -1307,12 +1307,12 @@ libsync_plugin_db_postgres_init (void *cls)
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "taler",
+                                             "sync",
                                              "CURRENCY",
                                              &pg->currency))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler",
+                               "sync",
                                "CURRENCY");
     GNUNET_free (pg->sql_dir);
     GNUNET_free (pg);
diff --git a/src/syncdb/sync_db_plugin.c b/src/syncdb/sync_db_plugin.c
@@ -51,10 +51,12 @@ SYNC_DB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg,
   plugin = GNUNET_PLUGIN_load (SYNC_project_data (),
                                lib_name,
                                (void *) cfg);
-  if (NULL != plugin)
-    plugin->library_name = lib_name;
-  else
+  if (NULL == plugin)
+  {
     GNUNET_free (lib_name);
+    return NULL;
+  }
+  plugin->library_name = lib_name;
   if ( (! skip_preflight) &&
        (GNUNET_OK !=
         plugin->preflight (plugin->cls)) )
diff --git a/src/syncdb/test_sync_db_postgres.conf b/src/syncdb/test_sync_db_postgres.conf
@@ -2,7 +2,7 @@
 #The DB plugin to use
 DB = postgres
 
-[taler]
+[sync]
 CURRENCY = EUR
 
 [syncdb-postgres]
diff --git a/src/testing/test_sync_api.conf b/src/testing/test_sync_api.conf
@@ -30,6 +30,7 @@ CONFIG = postgres:///synccheck
 SQL_DIR = $DATADIR/sql/
 
 [sync]
+CURRENCY = EUR
 PORT = 8084
 PAYMENT_BACKEND_URL = "http://localhost:8080/"
 ANNUAL_FEE = EUR:4.99