diff options
| -rw-r--r-- | src/backend/merchant.conf | 24 | ||||
| -rw-r--r-- | src/merchant-tools/taler-merchant-benchmark.c | 9 |
2 files changed, 5 insertions, 28 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 6a0cc53e..9554aeaa 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -58,27 +58,3 @@ WIRE_TRANSFER_DELAY = 3 week # proposal be valid? DEFAULT_PAY_DEADLINE = 1 day -[instance-default] -KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv - -# [merchant-account-merchant] - -# payto://-URL of the merchant's bank account. Required. -#PAYTO_URI = payto://x-taler-bank/bank/42 - -# File where this account's salted wire address is provided. -# File does not have to exist, will be generated from -# BANK_URL if it is missing. File must match BANK_URL. -#WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/accounts/default.json - -# Can this address be used in previous offers for -# instance "default"? Must be set to YES if ACTIVE_default is YES. -# Note that "default" here must match the instance's section name. -# The same account may be enabled/active in multiple instances. -#HONOR_default = YES - -# Should this address be used in offers we create right now for -# instance "default"? -# Inactive addresses (NO) will be supported for legacy contracts -# but not used for new contracts. -#ACTIVE_default = YES diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c index 2e9c9a17..349de80f 100644 --- a/src/merchant-tools/taler-merchant-benchmark.c +++ b/src/merchant-tools/taler-merchant-benchmark.c @@ -373,8 +373,8 @@ int main (int argc, char *const *argv) { - char *loglev; - char *logfile; + char *loglev = "INFO"; + char *logfile = NULL; char *exchange_account; char *alt_instance_id; struct GNUNET_OS_Process *bankd; @@ -495,15 +495,16 @@ main (int argc, argc, argv); if (GNUNET_SYSERR == result) + { return PG_BAD_OPTIONS; + } if (0 == result) return PG_SUCCESS; } if ( (! ordinary) && (! corner) ) { - fprintf (stderr, - "Please use 'ordinary' or 'corner' subcommands.\n"); + TALER_LOG_ERROR ("Please use 'ordinary' or 'corner' subcommands.\n"); return PG_NO_SUBCOMMAND; } if (NULL == cfg_filename) |