commit ccc0618d510bc088f59ebaf8a2b1645344610f22
parent 29e3125747782690a86505c58a3cd0acc5fa22b7
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Sat, 12 Jul 2025 17:16:17 +0200
set global_ret to indicate error better on taler-merchant-http setup
Diffstat:
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -2737,7 +2737,7 @@ run (void *cls,
"merchant",
&TMH_currency))
{
-
+ global_ret = EXIT_NOTCONFIGURED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2747,6 +2747,7 @@ run (void *cls,
&TMH_num_cspecs,
&TMH_cspecs))
{
+ global_ret = EXIT_NOTCONFIGURED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2782,6 +2783,7 @@ run (void *cls,
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"merchant",
"LEGAL_PRESERVATION");
+ global_ret = EXIT_NOTCONFIGURED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2797,6 +2799,7 @@ run (void *cls,
"merchant",
"BASE_URL",
"Needs to start with 'http://' or 'https://'");
+ global_ret = EXIT_NOTCONFIGURED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2811,6 +2814,7 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to setup templates\n");
+ global_ret = EXIT_NOTINSTALLED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2819,6 +2823,7 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to load single page app\n");
+ global_ret = EXIT_NOTINSTALLED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2828,12 +2833,14 @@ run (void *cls,
(TMH_by_id_map = GNUNET_CONTAINER_multihashmap_create (4,
GNUNET_YES)))
{
+ global_ret = EXIT_FAILURE;
GNUNET_SCHEDULER_shutdown ();
return;
}
if (NULL ==
(TMH_db = TALER_MERCHANTDB_plugin_load (cfg)))
{
+ global_ret = EXIT_NOTINSTALLED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2842,12 +2849,14 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to database. Consider running taler-merchant-dbinit!\n");
+ global_ret = EXIT_FAILURE;
GNUNET_SCHEDULER_shutdown ();
return;
}
elen = TMH_EXCHANGES_init (config);
if (GNUNET_SYSERR == elen)
{
+ global_ret = EXIT_NOTCONFIGURED;
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -2855,6 +2864,7 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Fatal: no trusted exchanges configured. Exiting.\n");
+ global_ret = EXIT_NOTCONFIGURED;
GNUNET_SCHEDULER_shutdown ();
return;
}