merchant

commit f042a1e3d7015625b61947cbae391f34d3a4f61a
parent 2be1f98af702ec9781932cc3cf84f76346244cb4
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 13 Nov 2025 18:34:14 +0100

improve logging for #10606

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
31
++++++++++++++++++++++++++++++-
M
src/merchant-tools/taler-merchant-passwd.c
 | 
12
+++++++++++-

2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -2947,7 +2947,16 @@ run (void *cls,
                                "DEFAULT_PAY_DELAY");
     TMH_default_pay_delay = GNUNET_TIME_UNIT_DAYS;
   }
-
+  if (GNUNET_TIME_relative_is_forever (TMH_default_pay_delay))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_INFO,
+                               "merchant",
+                               "DEFAULT_PAY_DELAY",
+                               "forever is not allowed");
+    global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
                                            "merchant",
@@ -2961,6 +2970,16 @@ run (void *cls,
       GNUNET_TIME_UNIT_DAYS,
       15);
   }
+  if (GNUNET_TIME_relative_is_forever (TMH_default_refund_delay))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_INFO,
+                               "merchant",
+                               "DEFAULT_REFUND_DELAY",
+                               "forever is not allowed");
+    global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
@@ -2973,6 +2992,16 @@ run (void *cls,
                                "DEFAULT_WIRE_TRANSFER_DELAY");
     TMH_default_wire_transfer_delay = GNUNET_TIME_UNIT_MONTHS;
   }
+  if (GNUNET_TIME_relative_is_forever (TMH_default_wire_transfer_delay))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_INFO,
+                               "merchant",
+                               "DEFAULT_WIRE_TRANSFER_DELAY",
+                               "forever is not allowed");
+    global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 
   {
     char *dwtri;
diff --git a/src/merchant-tools/taler-merchant-passwd.c b/src/merchant-tools/taler-merchant-passwd.c
@@ -183,7 +183,17 @@ run (void *cls,
         global_ret = 3;
         break;
       }
-      TMH_reload_instances (mi->settings.id);
+      {
+        struct GNUNET_DB_EventHeaderP es = {
+          .size = ntohs (sizeof (es)),
+          .type = ntohs (TALER_DBEVENT_MERCHANT_INSTANCE_SETTINGS)
+        };
+
+        plugin->event_notify (plugin->cls,
+                              &es,
+                              instance,
+                              strlen (instance) + 1);
+      }
     }
     else
     {