[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] branch master updated: fix adv overwrites err bug
From: |
gnunet |
Subject: |
[taler-taler-mdb] branch master updated: fix adv overwrites err bug |
Date: |
Tue, 23 Jan 2024 10:06:30 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository taler-mdb.
The following commit(s) were added to refs/heads/master by this push:
new 77d411d fix adv overwrites err bug
new ec4d1b3 Merge branch 'master' of git+ssh://git.taler.net/taler-mdb
77d411d is described below
commit 77d411d5eaf525dca9b2686ac9252c6e8b626324
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Tue Jan 23 10:06:03 2024 +0100
fix adv overwrites err bug
---
contrib/taler-mdb-ads.sh | 2 +-
src/taler-mdb.c | 66 +++++++++++++++++++++++++-----------------------
2 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/contrib/taler-mdb-ads.sh b/contrib/taler-mdb-ads.sh
index 6d831ce..0f1f5d6 100755
--- a/contrib/taler-mdb-ads.sh
+++ b/contrib/taler-mdb-ads.sh
@@ -39,7 +39,7 @@ DATA_HOME=$(taler-config -c "$CONF" -s paths -o DATADIR -f)
while true
do
- HOUR=$(date +%H)
+ HOUR=$(date +%H | sed -e "/^0//")
if [[ HOUR -ge 8 && HOUR -lt 22 ]]
then
taler-mdb-display -c "$CONF"
diff --git a/src/taler-mdb.c b/src/taler-mdb.c
index 3acd633..4d1e47d 100644
--- a/src/taler-mdb.c
+++ b/src/taler-mdb.c
@@ -894,6 +894,38 @@ start_command (const char *command,
}
+/**
+ * Stop the advertising process.
+ */
+static void
+stop_advertising (void)
+{
+ if (NULL == adv_child)
+ return;
+ GNUNET_break (0 ==
+ GNUNET_OS_process_kill (adv_child,
+ SIGTERM));
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_OS_process_wait (adv_child));
+ GNUNET_OS_process_destroy (adv_child);
+ adv_child = NULL;
+}
+
+
+/**
+ * Start the advertising process.
+ */
+static void
+start_advertising (void)
+{
+ stop_advertising (); /* just to be sure */
+ if (NULL == adv_process_command)
+ return;
+ adv_child = start_command (adv_process_command,
+ NULL);
+}
+
+
/**
* Stop the process showing an error.
*/
@@ -914,6 +946,7 @@ hide_error (void)
GNUNET_OS_process_wait (err_child));
GNUNET_OS_process_destroy (err_child);
err_child = NULL;
+ start_advertising ();
}
@@ -926,6 +959,7 @@ hide_error (void)
static void
show_error (const char *err_type)
{
+ stop_advertising ();
hide_error (); /* just to be sure */
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Showing error `%s'\n",
@@ -968,38 +1002,6 @@ temporary_error (const char *err_type)
}
-/**
- * Stop the advertising process.
- */
-static void
-stop_advertising (void)
-{
- if (NULL == adv_child)
- return;
- GNUNET_break (0 ==
- GNUNET_OS_process_kill (adv_child,
- SIGTERM));
- GNUNET_break (GNUNET_OK ==
- GNUNET_OS_process_wait (adv_child));
- GNUNET_OS_process_destroy (adv_child);
- adv_child = NULL;
-}
-
-
-/**
- * Start the advertising process.
- */
-static void
-start_advertising (void)
-{
- stop_advertising (); /* just to be sure */
- if (NULL == adv_process_command)
- return;
- adv_child = start_command (adv_process_command,
- NULL);
-}
-
-
#if HAVE_QRENCODE_H
#include <qrencode.h>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-mdb] branch master updated: fix adv overwrites err bug,
gnunet <=