merchant

commit 403898961107375a6d6470a428fb11dc592778c2
parent 2624d93cff06eaf31db5df7020cd6d751a591cd7
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Fri, 23 Sep 2016 18:44:35 +0200

testcase not passed, logs deployed

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
11
++++++-----
M
src/backend/taler-merchant-httpd_pay.c
 | 
3
+++
M
src/lib/test_merchant_api.conf
 | 
2
+-

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -512,7 +512,8 @@ instances_iterator_cb (void *cls,
                 "Failed to hash wireformat\n");
     iic->ret |= GNUNET_SYSERR;
   }
-  #if EXTRADEBUG
+  #define EXTRADEBUGG
+  #ifdef EXTRADEBUG
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Found wireformat instance:\n");
               json_dumpf (mi->j_wire, stdout, 0);
@@ -534,7 +535,7 @@ instances_iterator_cb (void *cls,
                                          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to put an entry into the 'by_id' hashmap");
+                "Failed to put an entry into the 'by_id' hashmap\n");
     iic->ret |= GNUNET_SYSERR;
   }
 
@@ -545,7 +546,7 @@ instances_iterator_cb (void *cls,
                                          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to put an entry into the 'by_kpub_map' hashmap");
+                "Failed to put an entry into the 'by_kpub_map' hashmap\n");
     iic->ret |= GNUNET_SYSERR;
   }
 }
@@ -645,7 +646,7 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config,
   GNUNET_free (lib_name);
 
   GNUNET_array_append (instances, iic->current_index, NULL);
-  #if EXTRADEBUG
+  #ifdef EXTRADEBUG
   unsigned int i;
   for (i=0; NULL != instances[i]; i++)
   {
@@ -662,7 +663,7 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config,
     pub =
       GNUNET_STRINGS_data_to_string_alloc (&instances[i]->pubkey.eddsa_pub,
                                            sizeof (struct GNUNET_CRYPTO_EddsaPublicKey));
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "instances[%d]: id=%s,\nj_wire=%s,\nj_hash=%s,\npriv=%s,\npub=%s\n",
                 i,
                 instances[i]->id,
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
@@ -922,6 +922,9 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
     pc->mi = get_instance (root);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "/pay: picked instance %s\n",
+                pc->mi->id);
 
     if (NULL == pc->mi)
     {
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
@@ -52,7 +52,7 @@ KEYFILE = test_merchant.priv
 TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
 
 [merchant-instance-tor]
-KEYFILE = test_merchant.priv
+KEYFILE = tor_merchant.priv
 
 [tor-wireformat]
 TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json