Merge branch 'master' into age-withdraw

4 files changed, 29 insertions, 23 deletions

diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index c88ddd7c..d247d981 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -81,6 +81,11 @@
 #define UNIX_BACKLOG 50
 
 /**
+ * How often will we try to connect to the database before giving up?
+ */
+#define MAX_DB_RETRIES 5
+
+/**
  * Above what request latency do we start to log?
  */
 #define WARN_LATENCY GNUNET_TIME_relative_multiply ( \
@@ -1965,11 +1970,20 @@ exchange_serve_process_config (void)
     GNUNET_free (attr_enc_key_str);
   }
 
-  if (NULL ==
-      (TEH_plugin = TALER_EXCHANGEDB_plugin_load (TEH_cfg)))
+  for (unsigned int i = 0; i<MAX_DB_RETRIES; i++)
+  {
+    TEH_plugin = TALER_EXCHANGEDB_plugin_load (TEH_cfg);
+    if (NULL != TEH_plugin)
+      break;
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to DB, will try again %u times\n",
+                MAX_DB_RETRIES - i);
+    sleep (1);
+  }
+  if (NULL == TEH_plugin)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to initialize DB subsystem\n");
+                "Failed to initialize DB subsystem. Giving up.\n");
     return GNUNET_SYSERR;
   }
   return GNUNET_OK;
diff --git a/src/exchange/taler-exchange-httpd_csr.c b/src/exchange/taler-exchange-httpd_csr.c
index a22fdfff..29f83c2c 100644
--- a/src/exchange/taler-exchange-httpd_csr.c
+++ b/src/exchange/taler-exchange-httpd_csr.c
@@ -234,12 +234,10 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
     .cipher = TALER_DENOMINATION_CS
   };
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_fixed ("nonce",
-                            &nonce,
-                            sizeof (struct TALER_CsNonce)),
-    GNUNET_JSON_spec_fixed ("denom_pub_hash",
-                            &denom_pub_hash,
-                            sizeof (struct TALER_DenominationHashP)),
+    GNUNET_JSON_spec_fixed_auto ("nonce",
+                                 &nonce),
+    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
+                                 &denom_pub_hash),
     GNUNET_JSON_spec_end ()
   };
   struct TEH_DenominationKey *dk;
@@ -333,17 +331,11 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
     }
   }
 
-  {
-    json_t *csr_obj;
-
-    csr_obj = GNUNET_JSON_PACK (
-      TALER_JSON_pack_exchange_withdraw_values ("ewv",
-                                                &ewv));
-    GNUNET_assert (NULL != csr_obj);
-    return TALER_MHD_reply_json_steal (rc->connection,
-                                       csr_obj,
-                                       MHD_HTTP_OK);
-  }
+  return TALER_MHD_REPLY_JSON_PACK (
+    rc->connection,
+    MHD_HTTP_OK,
+    TALER_JSON_pack_exchange_withdraw_values ("ewv",
+                                              &ewv));
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 8b72d780..d7328350 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -738,7 +738,7 @@ free_denom_cb (void *cls,
  * @param value the `struct HelperSignkey` to release
  * @return #GNUNET_OK (continue to iterate)
  */
-static int
+static enum GNUNET_GenericReturnValue
 free_esign_cb (void *cls,
                const struct GNUNET_PeerIdentity *pid,
                void *value)
@@ -3616,6 +3616,7 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
     if ( (GNUNET_is_zero (&denom_rsa_sm_pub)) &&
          (GNUNET_is_zero (&denom_cs_sm_pub)) )
     {
+      /* Either IPC failed, or neither helper had any denominations configured. */
       return TALER_MHD_reply_with_error (connection,
                                          MHD_HTTP_BAD_GATEWAY,
                                          TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE,
@@ -3628,7 +3629,6 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
                                          TALER_EC_EXCHANGE_SIGNKEY_HELPER_UNAVAILABLE,
                                          NULL);
     }
-    // then a secmod helper is not yet running and we should return an MHD_HTTP_BAD_GATEWAY!
     GNUNET_assert (NULL != fbc.denoms);
     GNUNET_assert (NULL != fbc.signkeys);
     GNUNET_CONTAINER_multihashmap_iterate (ksh->helpers->denom_keys,
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index a7a6b004..168e7b9b 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -757,7 +757,7 @@ continue_with_shard (void *cls)
                       shard_end - latest_row_off);
   GNUNET_assert (NULL == hh);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Requesting credit history staring from %llu\n",
+              "Requesting credit history starting from %llu\n",
               (unsigned long long) latest_row_off);
   hh_start_time = GNUNET_TIME_absolute_get ();
   hh_returned_data = false;