diff options
| author | Christian Grothoff <christian@grothoff.org> | 2024-01-28 18:59:42 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2024-01-28 18:59:42 +0100 |
| commit | e9fa3224538fade591e40a8b4c4e19b90b8591b1 (patch) | |
| tree | c7960bb43fd3fac233600c5b45328b7b6ec270c3 | |
| parent | 964365ebdeb18e8c2de2abab9bf1dd59ed2b664b (diff) | |
| download | merchant-e9fa3224538fade591e40a8b4c4e19b90b8591b1.tar.gz merchant-e9fa3224538fade591e40a8b4c4e19b90b8591b1.tar.bz2 merchant-e9fa3224538fade591e40a8b4c4e19b90b8591b1.zip | |
modify taler-merchant-httpd for #8030
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 83390887..59f61899 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -192,7 +192,7 @@ static struct GNUNET_CURL_RescheduleContext *merchant_curl_rc; /** * Global return code */ -static int result; +static int global_ret; /** * Our configuration. @@ -2128,7 +2128,7 @@ load_instances (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed initialization. Check database setup.\n"); - result = EXIT_FAILURE; + global_ret = EXIT_NOPERMISSION; GNUNET_SCHEDULER_shutdown (); return; } @@ -2196,7 +2196,7 @@ run (void *cls, fprintf (stderr, "Authentication token does not start with `%s' prefix\n", RFC_8959_PREFIX); - result = GNUNET_SYSERR; + global_ret = EXIT_NOTCONFIGURED; GNUNET_SCHEDULER_shutdown (); return; } @@ -2208,7 +2208,7 @@ run (void *cls, go |= TALER_MHD_GO_FORCE_CONNECTION_CLOSE; TALER_MHD_setup (go); - result = GNUNET_SYSERR; + global_ret = EXIT_SUCCESS; GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); @@ -2218,7 +2218,7 @@ run (void *cls, if (NULL == TMH_curl_ctx) { GNUNET_break (0); - result = GNUNET_SYSERR; + global_ret = EXIT_NO_RESTART; GNUNET_SCHEDULER_shutdown (); return; } @@ -2234,7 +2234,7 @@ run (void *cls, TALER_config_get_currency (cfg, &TMH_currency)) { - + GNUNET_SCHEDULER_shutdown (); return; } @@ -2267,7 +2267,7 @@ run (void *cls, &TMH_base_url)) { if (! TALER_is_web_url (TMH_base_url)) - { + { GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "merchant", "BASE_URL", @@ -2375,7 +2375,7 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } - result = GNUNET_OK; + global_ret = EXIT_SUCCESS; TALER_MHD_daemon_start (mhd); } } @@ -2419,5 +2419,5 @@ main (int argc, return EXIT_INVALIDARGUMENT; if (GNUNET_NO == res) return EXIT_SUCCESS; - return (GNUNET_OK == result) ? EXIT_SUCCESS : 1; + return global_ret; } |