-remove linger

5 files changed, 19 insertions, 35 deletions

diff --git a/src/benchmark/benchmark-common.conf b/src/benchmark/benchmark-common.conf
index fc93b2a90..230c7bfbb 100644
--- a/src/benchmark/benchmark-common.conf
+++ b/src/benchmark/benchmark-common.conf
@@ -13,7 +13,9 @@ PORT=8081
 MASTER_PUBLIC_KEY=98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
 DB=postgres
 BASE_URL="http://localhost:8081/"
-AGGREGATOR_SHARD_SIZE=67108864
+# Only set this option if you are actually running
+# multiple aggregators!
+# AGGREGATOR_SHARD_SIZE=67108864
 WIREWATCH_IDLE_SLEEP_INTERVAL=5 ms
 
 [exchangedb-postgres]
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index a4f9e11e7..35b96e077 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -125,11 +125,6 @@ static unsigned int label_len;
 static unsigned int label_off;
 
 /**
- * Linger around until stop is requested by the user explicitly by key stroke.
- */
-static int linger;
-
-/**
  * Performance counters.
  */
 static struct TALER_TESTING_Timer timings[] = {
@@ -465,11 +460,6 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
       }
     }
   }
-  if (GNUNET_YES == linger)
-  {
-    printf ("press ENTER to stop\n");
-    (void) getchar ();
-  }
   return result;
 }
 
@@ -491,8 +481,24 @@ main (int argc,
         &cfg_filename)),
     GNUNET_GETOPT_option_version (
       PACKAGE_VERSION " " VCS_VERSION),
+    GNUNET_GETOPT_option_flag (
+      'f',
+      "fakebank",
+      "use fakebank for the banking system",
+      &use_fakebank),
+    GNUNET_GETOPT_option_flag (
+      'F',
+      "reserves-first",
+      "should all reserves be created first, before starting normal operations",
+      &reserves_first),
     GNUNET_GETOPT_option_help (
       "Exchange benchmark"),
+    GNUNET_GETOPT_option_string (
+      'l',
+      "logfile",
+      "LF",
+      "will log to file LF",
+      &logfile),
     GNUNET_GETOPT_option_loglevel (
       &loglev),
     GNUNET_GETOPT_option_uint (
@@ -520,32 +526,11 @@ main (int argc,
       "Probability of refresh per coin (0-100)",
       &refresh_rate),
     GNUNET_GETOPT_option_string (
-      'l',
-      "logfile",
-      "LF",
-      "will log to file LF",
-      &logfile),
-    GNUNET_GETOPT_option_string (
       'u',
       "exchange-account-section",
       "SECTION",
       "use exchange bank account configuration from the given SECTION",
       &exchange_bank_section),
-    GNUNET_GETOPT_option_flag (
-      'f',
-      "fakebank",
-      "use fakebank for the banking system",
-      &use_fakebank),
-    GNUNET_GETOPT_option_flag (
-      'F',
-      "reserves-first",
-      "should all reserves be created first, before starting normal operations",
-      &reserves_first),
-    GNUNET_GETOPT_option_flag (
-      'K',
-      "linger",
-      "linger around until key press",
-      &linger),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue result;
diff --git a/src/testing/testing_api_cmd_exec_aggregator.c b/src/testing/testing_api_cmd_exec_aggregator.c
index 0f3cc1e14..1f05576ff 100644
--- a/src/testing/testing_api_cmd_exec_aggregator.c
+++ b/src/testing/testing_api_cmd_exec_aggregator.c
@@ -72,7 +72,6 @@ aggregator_run (void *cls,
                                "taler-exchange-aggregator",
                                "taler-exchange-aggregator",
                                "-c", as->config_filename,
-                               "-L", "INFO",
                                "-t", /* exit when done */
                                (as->kyc_on)
                                ? NULL
diff --git a/src/testing/testing_api_cmd_exec_transfer.c b/src/testing/testing_api_cmd_exec_transfer.c
index f8af443bd..300413b4b 100644
--- a/src/testing/testing_api_cmd_exec_transfer.c
+++ b/src/testing/testing_api_cmd_exec_transfer.c
@@ -67,7 +67,6 @@ transfer_run (void *cls,
                                "taler-exchange-transfer",
                                "taler-exchange-transfer",
                                "-c", as->config_filename,
-                               "-L", "INFO",
                                "-S", "1",
                                "-w", "0",
                                "-t", /* exit when done */
diff --git a/src/testing/testing_api_cmd_exec_wirewatch.c b/src/testing/testing_api_cmd_exec_wirewatch.c
index 6bc3f2c74..b6ed4f0f1 100644
--- a/src/testing/testing_api_cmd_exec_wirewatch.c
+++ b/src/testing/testing_api_cmd_exec_wirewatch.c
@@ -75,7 +75,6 @@ wirewatch_run (void *cls,
                                "-S", "1",
                                "-w", "0",
                                "-t", /* exit when done */
-                               "-L", "DEBUG",
                                (NULL == ws->account_section)
                                ? NULL
                                : "-a",