[taler-donau] branch master updated: httpd config change

[gnunet]

This is an automated email from the git hooks/post-receive script.

johannes-casaburi pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new 3d789ac  httpd config change
3d789ac is described below

commit 3d789ac21aa08dd5bc09617c5f5e0ac114d16f4e
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Tue Jan 9 11:58:03 2024 +0100

    httpd config change
---
 contrib/gana                    |  2 +-
 src/donau/donau-httpd.c         | 26 +++++++++++++-------------
 src/donau/donau-httpd.h         |  2 +-
 src/donau/donau.conf            |  2 +-
 src/donau/test_donau_httpd.conf |  5 +----
 src/testing/test_donau_api.conf |  2 +-
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 6d3fb42..40f6cf1 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 6d3fb428f0a2dd5bc5f35516ea77c32c2cf0ecfa
+Subproject commit 40f6cf1015231663064eda98aa1e403cddd7b970
diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c
index 9877857..6ff4796 100644
--- a/src/donau/donau-httpd.c
+++ b/src/donau/donau-httpd.c
@@ -80,7 +80,7 @@ static struct MHD_Daemon *mhd;
 /**
  * How long is caching /keys allowed at most? (global)
  */
-struct GNUNET_TIME_Relative DH_max_keys_caching;
+// struct GNUNET_TIME_Relative DH_max_keys_caching;
 
 /**
  * Our DB plugin.  (global)
@@ -699,18 +699,18 @@ donau_serve_process_config (void)
     req_max = ULLONG_MAX;
   }
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (DH_cfg,
-                                           "donau",
-                                           "MAX_KEYS_CACHING",
-                                           &DH_max_keys_caching))
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "donau",
-                               "MAX_KEYS_CACHING",
-                               "valid relative time expected");
-    return GNUNET_SYSERR;
-  }
+  // if (GNUNET_OK !=
+  //    GNUNET_CONFIGURATION_get_value_time (DH_cfg,
+  //                                         "donau",
+  //                                         "MAX_KEYS_CACHING",
+  //                                         &DH_max_keys_caching))
+  // {
+  //  GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+  //                             "donau",
+  //                             "MAX_KEYS_CACHING",
+  //                             "valid relative time expected");
+  //  return GNUNET_SYSERR;
+  // }
   if (GNUNET_OK !=
       TALER_config_get_currency (DH_cfg,
                                  &DH_currency))
diff --git a/src/donau/donau-httpd.h b/src/donau/donau-httpd.h
index 8e16059..4ef824c 100644
--- a/src/donau/donau-httpd.h
+++ b/src/donau/donau-httpd.h
@@ -32,7 +32,7 @@
 /**
  * How long is caching /keys allowed at most?
  */
-extern struct GNUNET_TIME_Relative DH_max_keys_caching;
+// extern struct GNUNET_TIME_Relative DH_max_keys_caching;
 
 /**
  * The donau's configuration.
diff --git a/src/donau/donau.conf b/src/donau/donau.conf
index b52ba22..882b772 100644
--- a/src/donau/donau.conf
+++ b/src/donau/donau.conf
@@ -20,7 +20,7 @@ ATTRIBUTE_ENCRYPTION_KEY = SET_ME_PLEASE
 # limit is the minimum of this value and the first expected
 # significant change in /keys based on the expiration times.
 # Used to artificially reduce caching (addresses #5747).
-MAX_KEYS_CACHING = forever
+# MAX_KEYS_CACHING = forever
 
 # After how many requests should the donau auto-restart
 # (to address potential issues with memory fragmentation)?
diff --git a/src/donau/test_donau_httpd.conf b/src/donau/test_donau_httpd.conf
index 50d571c..a333960 100644
--- a/src/donau/test_donau_httpd.conf
+++ b/src/donau/test_donau_httpd.conf
@@ -4,13 +4,10 @@ TALER_TEST_HOME = test_taler_donau_httpd_home/
 TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
 
 [taler]
-# Currency supported by the donau (can only be one)
+# Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
 
-[auditor]
-TINY_AMOUNT = EUR:0.01
-
 [donau]
 
 # Directory with our terms of service.
diff --git a/src/testing/test_donau_api.conf b/src/testing/test_donau_api.conf
index 37a4228..bc49676 100644
--- a/src/testing/test_donau_api.conf
+++ b/src/testing/test_donau_api.conf
@@ -17,7 +17,7 @@ DB = postgres
 BASE_URL = "http://localhost:8080/";
 SERVE = tcp
 EXPIRE_IDLE_SLEEP_INTERVAL ="1 s"
-MAX_KEYS_CACHING = forever
+#MAX_KEYS_CACHING = forever
 
 [donaudb-postgres]
 CONFIG = "postgres:///talercheck"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.