merchant

commit 0673f5d923ede7a40a7cd011967222b73acb9cc5
parent a64d7a9a96c686cd003d7a45c1789cd759b72429
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Fri, 11 May 2018 16:34:50 +0200

provide --config as well.

Diffstat:
M
src/merchant-tools/taler-merchant-generate-payments_new.c
 | 
17
++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/merchant-tools/taler-merchant-generate-payments_new.c b/src/merchant-tools/taler-merchant-generate-payments_new.c
@@ -95,6 +95,11 @@ static const char *default_config_file;
 static char *loglev;
 
 /**
+ * Config filename.
+ */
+static char *cfg_filename;
+
+/**
  * Bank base URL.
  */
 static char *bank_url;
@@ -125,7 +130,7 @@ run (void *cls,
 
     TALER_TESTING_cmd_exec_wirewatch
       ("wirewatch-1",
-       default_config_file),
+       cfg_filename),
 
     TALER_TESTING_cmd_withdraw_amount
       ("withdraw-coin-1",
@@ -218,7 +223,7 @@ run (void *cls,
 
     TALER_TESTING_cmd_exec_aggregator
       ("aggregate-1",
-       default_config_file),
+       cfg_filename),
 
     TALER_TESTING_cmd_merchant_track_transaction
       ("track-transaction-1",
@@ -279,6 +284,9 @@ main (int argc,
 
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
+    GNUNET_GETOPT_option_cfgfile
+      (&cfg_filename),
+
     GNUNET_GETOPT_option_version
       (PACKAGE_VERSION " " VCS_VERSION),
 
@@ -286,7 +294,7 @@ main (int argc,
       ("Generate Taler payments to populate the database(s)"),
 
     GNUNET_GETOPT_option_loglevel
-      (loglev),
+      (&loglev),
 
     GNUNET_GETOPT_option_uint
       ('n',
@@ -351,6 +359,9 @@ main (int argc,
                     loglev,
                     logfile);
 
+  if (NULL == cfg_filename)
+    cfg_filename = (char *) default_config_file;
+
   if (NULL == merchant_url)
   {
     TALER_LOG_ERROR ("Option -m is mandatory!\n");