From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 2 Apr 2017 21:20:45 +0000 (+0100)
Subject: wip fixes
X-Git-Tag: hippotat/1.0.0~55^2~123
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=commitdiff_plain;h=f754eec46013979bd2e634cece1c1cd4290e4bbc

wip fixes
---

diff --git a/README.config b/README.config
index 881694f..fc2922f 100644
--- a/README.config
+++ b/README.config
@@ -61,7 +61,12 @@ Capped settings:
      [65536 bytes; LIMIT: 262144 bytes]
 
   max_queue_time
-     Discard downwards packets after this long (used by server only)
+     Discard packets after they have been queued this long waiting
+     for http.
+     On server: setting applies to downward packets, and is capped
+      by LIMIT values.
+     On client: setting applies to upward packets, and is
+      not affected by LIMIT values.
      [10 s; LIMIT: 121 s]
 
   http_timeout
diff --git a/client b/client
index 074803a..a56dde2 100755
--- a/client
+++ b/client
@@ -214,6 +214,7 @@ def process_cfg(putative_servers, putative_clients):
       c.max_outstanding = srch(cfg.getint, 'max_requests_outstanding')
       c.max_batch_up    = srch(cfg.getint, 'max_batch_up')
       c.http_retry      = srch(cfg.getint, 'http_retry')
+      c.max_queue_time  = srch(cfg.getint, 'max_queue_time')
       c.vroutes         = srch(cfg.get,    'vroutes')
 
       try: c.url = srch(cfg.get,'url')