[taler-exchange] branch master updated: improve logging, fix one wrong assertion, improve EC

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new ccad3328 improve logging, fix one wrong assertion, improve EC
ccad3328 is described below

commit ccad332859d1c44bd06d96a936e77e56edc1ebef
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Fri Nov 12 15:59:13 2021 +0100

    improve logging, fix one wrong assertion, improve EC
---
 contrib/gana                             | 2 +-
 src/exchange/taler-exchange-httpd_keys.c | 1 -
 src/util/crypto_helper_denom.c           | 9 ++++++---
 src/util/crypto_helper_esign.c           | 9 ++++++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 8c7d9be4..478c0bd9 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 8c7d9be40ba627348da3e01b91b4f1d3cc78631f
+Subproject commit 478c0bd987c8c1135e5691c31abaa3f4ddce6f24
diff --git a/src/exchange/taler-exchange-httpd_keys.c 
b/src/exchange/taler-exchange-httpd_keys.c
index 70590020..41c664b3 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -721,7 +721,6 @@ helper_esign_cb (
   {
     /* should be just an update (revocation!), so update existing entry */
     hsk->validity_duration = validity_duration;
-    GNUNET_break (0 == start_time.abs_value_us);
     return;
   }
   GNUNET_assert (NULL != sm_pub);
diff --git a/src/util/crypto_helper_denom.c b/src/util/crypto_helper_denom.c
index 5352cba9..a7190c8a 100644
--- a/src/util/crypto_helper_denom.c
+++ b/src/util/crypto_helper_denom.c
@@ -109,6 +109,9 @@ try_connect (struct TALER_CRYPTO_DenominationHelper *dh)
   tmpdir = GNUNET_DISK_mktemp (dh->template);
   if (NULL == tmpdir)
   {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "mktemp",
+                              dh->template);
     do_disconnect (dh);
     return;
   }
@@ -465,7 +468,7 @@ TALER_CRYPTO_helper_denom_poll (struct 
TALER_CRYPTO_DenominationHelper *dh)
         if (! await_read_ready (dh))
         {
           /* timeout AND not synced => full reconnect */
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                       "Restarting connection to RSA helper, did not come up 
properly\n");
           do_disconnect (dh);
           if (0 == retry_limit)
@@ -597,10 +600,10 @@ TALER_CRYPTO_helper_denom_sign (
 
     if (! await_read_ready (dh))
     {
-      do_disconnect (dh);
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Timeout waiting for helper\n");
-      *ec = TALER_EC_GENERIC_TIMEOUT;
+      do_disconnect (dh);
+      *ec = TALER_EC_EXCHANGE_GENERIC_SECMOD_TIMEOUT;
       return ds;
     }
     ret = recv (dh->sock,
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
index f15b2455..2faebd51 100644
--- a/src/util/crypto_helper_esign.c
+++ b/src/util/crypto_helper_esign.c
@@ -110,6 +110,9 @@ try_connect (struct TALER_CRYPTO_ExchangeSignHelper *esh)
   tmpdir = GNUNET_DISK_mktemp (esh->template);
   if (NULL == tmpdir)
   {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "mktemp",
+                              esh->template);
     do_disconnect (esh);
     return;
   }
@@ -416,7 +419,7 @@ TALER_CRYPTO_helper_esign_poll (struct 
TALER_CRYPTO_ExchangeSignHelper *esh)
         if (! await_read_ready (esh))
         {
           /* timeout AND not synced => full reconnect */
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                       "Restarting connection to EdDSA helper, did not come up 
properly\n");
           do_disconnect (esh);
           if (0 == retry_limit)
@@ -538,10 +541,10 @@ TALER_CRYPTO_helper_esign_sign_ (
 
     if (! await_read_ready (esh))
     {
-      do_disconnect (esh);
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Timeout waiting for helper\n");
-      return TALER_EC_GENERIC_TIMEOUT;
+      do_disconnect (esh);
+      return TALER_EC_EXCHANGE_GENERIC_SECMOD_TIMEOUT;
     }
     ret = recv (esh->sock,
                 buf,

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