From 07d575ef63ca40a2e2c2c234e05f6aa56e0dbadf Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 22 Apr 2016 18:14:38 +0200 Subject: renaming trusted exchanges config token --- src/backend/taler-merchant-httpd_exchanges.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index 6a6b76e7..db248648 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -501,8 +501,8 @@ parse_exchanges (void *cls, struct Exchange *exchange; if (0 != strncasecmp (section, - "exchange-", - strlen ("exchange-"))) + "merchant-exchange-", + strlen ("merchant-exchange-"))) return; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, -- cgit v1.2.3 From 3e89e5a7246a0a4a35a269bebf12f3774d9e9e93 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 22 Apr 2016 18:32:26 +0200 Subject: logging --- src/backend/taler-merchant-httpd_exchanges.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index db248648..2f52d19b 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -325,6 +325,9 @@ return_result (void *cls) GNUNET_CONTAINER_DLL_remove (exchange->fo_head, exchange->fo_tail, fo); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Returning result for exchange %s, trusted=%d\n", + exchange->uri, exchange->trusted); fo->fc (fo->fc_cls, (GNUNET_SYSERR == exchange->pending) ? NULL : exchange->conn, exchange->trusted); -- cgit v1.2.3 From 9d78031799dbb0485550e69b9bc7f47970ce362a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 22 Apr 2016 18:37:08 +0200 Subject: logging --- src/backend/taler-merchant-httpd_exchanges.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index 2f52d19b..9cbcff48 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -347,6 +347,9 @@ static void retry_exchange (void *cls) { struct Exchange *exchange = (struct Exchange *) cls; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Connecting to exchange exchange %s in retry_exchange\n", + exchange->uri); exchange->pending = GNUNET_SYSERR; /* failed hard */ exchange->conn = TALER_EXCHANGE_connect (merchant_curl_ctx, -- cgit v1.2.3 From 06091b0a45b26ccf8939825bfa209a17539ddbac Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 22 Apr 2016 18:42:34 +0200 Subject: logging --- src/backend/taler-merchant-httpd_exchanges.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index 9cbcff48..73ec7052 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -545,6 +545,13 @@ parse_exchanges (void *cls, } GNUNET_free (mks); } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "MASTER_KEY not given in section '%s', not trusting exchange\n", + section); + + } GNUNET_CONTAINER_DLL_insert (exchange_head, exchange_tail, exchange); -- cgit v1.2.3