taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

return proper error message instead of aborting, fix a few minor memory leaks in taler-exchange-benchmark

Browse Source
This commit is contained in:
Christian Grothoff 2019-03-13 04:11:35 +01:00
parent e235945df9
commit ae4b240ec2
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/benchmark/benchmark.conf
View File

@ -29,6 +29,9 @@ base_url = "http://localhost:8081/"
# Keep it short so the test runs fast. # Keep it short so the test runs fast.
lookahead_sign = 12 h lookahead_sign = 12 h
[auditor]
BASE_URL = "http://localhost:8085/"
[exchangedb-postgres] [exchangedb-postgres]
config = "postgres:///talercheck" config = "postgres:///talercheck"

38
src/benchmark/taler-exchange-benchmark.c
View File

@ -908,20 +908,42 @@ main (int argc,
GNUNET_CONFIGURATION_iterate_sections GNUNET_CONFIGURATION_iterate_sections
(cfg, (cfg,
pick_exchange_account_cb, &pick_exchange_account_cb,
&bank_details_section); &bank_details_section);
GNUNET_assert (NULL != bank_details_section); if (NULL == bank_details_section)
GNUNET_assert {
(GNUNET_OK == GNUNET_CONFIGURATION_get_value_string GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Missing specification of bank account in configuration\n"));
return BAD_CONFIG_FILE;
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string
(cfg, (cfg,
bank_details_section, bank_details_section,
"url", "url",
&exchange_payto_url)); &exchange_payto_url))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
bank_details_section,
"url");
GNUNET_free (bank_details_section);
return BAD_CONFIG_FILE;
}
GNUNET_assert if (TALER_EC_NONE !=
(TALER_EC_NONE == parse_payto (exchange_payto_url, parse_payto (exchange_payto_url,
&exchange_bank_account)); &exchange_bank_account))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Malformed payto:// URL `%s' in configuration\n"),
exchange_payto_url);
GNUNET_free (exchange_payto_url);
GNUNET_free (bank_details_section);
return BAD_CONFIG_FILE;
}
GNUNET_free (exchange_payto_url);
GNUNET_free (bank_details_section);
} }
if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) ) if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) )
{ {