[taler-merchant] branch master updated: fix auto-restart on DB down

[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 07600800 fix auto-restart on DB down
07600800 is described below

commit 07600800675faa5192fd0384a6811514f6c826ae
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jun 11 11:39:30 2024 +0200

    fix auto-restart on DB down
---
 debian/changelog                       |  1 +
 src/backend/taler-merchant-exchange.c  | 11 ++++++-----
 src/backend/taler-merchant-webhook.c   |  4 ++--
 src/backend/taler-merchant-wirewatch.c |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2bfb0bf6..9f41a83e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ taler-merchant (0.11.4) unstable; urgency=low
 
 taler-merchant (0.11.3) unstable; urgency=low
 
+  * Remove legacy user-type from API.
   * Importing bank account info.
 
  -- Sebastian Marchano <sebasjm@taler.net>  Mon 3 Jun 2024 13:20:12 -0300
diff --git a/src/backend/taler-merchant-exchange.c 
b/src/backend/taler-merchant-exchange.c
index 7945cb50..72566e9b 100644
--- a/src/backend/taler-merchant-exchange.c
+++ b/src/backend/taler-merchant-exchange.c
@@ -32,8 +32,8 @@
  * long-polling and do not want to wake up too often.
  */
 #define EXCHANGE_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_MINUTES, \
-    30)
+          GNUNET_TIME_UNIT_MINUTES, \
+          30)
 
 /**
  * How many inquiries do we process concurrently at most.
@@ -1154,7 +1154,8 @@ find_work (void *cls)
       return;
     }
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "No open inquiries found, waiting for notification to 
resume\n");
+                "No open inquiries found, waiting for notification to 
resume\n")
+    ;
   }
 }
 
@@ -1215,7 +1216,7 @@ run (void *cls,
   {
     GNUNET_break (0);
     GNUNET_SCHEDULER_shutdown ();
-    global_ret = EXIT_NO_RESTART;
+    global_ret = EXIT_FAILURE;
     return;
   }
   if (NULL ==
@@ -1233,7 +1234,7 @@ run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to connect to database\n");
     GNUNET_SCHEDULER_shutdown ();
-    global_ret = EXIT_NO_RESTART;
+    global_ret = EXIT_FAILURE;
     return;
   }
   {
diff --git a/src/backend/taler-merchant-webhook.c 
b/src/backend/taler-merchant-webhook.c
index 80db78fd..1d17843e 100644
--- a/src/backend/taler-merchant-webhook.c
+++ b/src/backend/taler-merchant-webhook.c
@@ -506,7 +506,7 @@ run (void *cls,
   {
     GNUNET_break (0);
     GNUNET_SCHEDULER_shutdown ();
-    global_ret = EXIT_NO_RESTART;
+    global_ret = EXIT_FAILURE;
     return;
   }
   if (NULL ==
@@ -524,7 +524,7 @@ run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to connect to database\n");
     GNUNET_SCHEDULER_shutdown ();
-    global_ret = EXIT_NO_RESTART;
+    global_ret = EXIT_FAILURE;
     return;
   }
   {
diff --git a/src/backend/taler-merchant-wirewatch.c 
b/src/backend/taler-merchant-wirewatch.c
index 17eb7a0a..bba101e3 100644
--- a/src/backend/taler-merchant-wirewatch.c
+++ b/src/backend/taler-merchant-wirewatch.c
@@ -641,7 +641,7 @@ run (void *cls,
   {
     GNUNET_break (0);
     GNUNET_SCHEDULER_shutdown ();
-    global_ret = EXIT_NO_RESTART;
+    global_ret = EXIT_FAILURE;
     return;
   }
   if (NULL ==
@@ -659,7 +659,7 @@ run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to connect to database\n");
     GNUNET_SCHEDULER_shutdown ();
-    global_ret = EXIT_NO_RESTART;
+    global_ret = EXIT_FAILURE;
     return;
   }
   {

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