[taler-merchant] branch master updated: modify taler-merchant-httpd for #8030

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new e9fa3224 modify taler-merchant-httpd for #8030
e9fa3224 is described below

commit e9fa3224538fade591e40a8b4c4e19b90b8591b1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jan 28 18:59:42 2024 +0100

    modify taler-merchant-httpd for #8030
---
 src/backend/taler-merchant-httpd.c | 18 +++++++++---------
 1 file 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;
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.