chiark / gitweb /
fixes
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 23 Mar 2017 18:47:56 +0000 (18:47 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 23 Mar 2017 18:47:56 +0000 (18:47 +0000)
client
fake-userv
hippotat/__init__.py

diff --git a/client b/client
index 4e0bb70..018da51 100755 (executable)
--- a/client
+++ b/client
@@ -35,6 +35,7 @@ def process_cfg():
   c.routes = cfg.get('virtual','routes')
   c.max_queue_time = cfg.getint(client_cs, 'max_queue_time')
   c.max_batch_up   = cfg.getint(client_cs, 'max_batch_up')
+  c.http_timeout   = cfg.getint(client_cs, 'http_timeout')
 
   process_cfg_ipif(client_cs,
                    (('local', 'client'),
index cf5c9f0..03e8653 100755 (executable)
@@ -1,9 +1,10 @@
 #!/bin/sh
-set -e
+set -ex
 echo >&2 "$0: invoked as $0 $*"
 exec 3<&0 4>&1 5>&2 >&2 </dev/null
+printenv
 exec xterm -T netns -e unshare -n -- sh -xc '
-  ../userv-utils.git/ipif/service "$@" <&3 >&4 2>&5 &
+  "$@" <&3 >&4 2>&5 &
   sleep 0.1
   env - bash -i
 ' x "$@"
index 8694e97..67991b0 100644 (file)
@@ -166,7 +166,8 @@ def start_ipif(command, router):
   ipif = _IpifProcessProtocol(router)
   reactor.spawnProcess(ipif,
                        '/bin/sh',['sh','-xc', command],
-                       childFDs={0:'w', 1:'r', 2:2})
+                       childFDs={0:'w', 1:'r', 2:2},
+                       env=None)
 
 def queue_inbound(packet):
   ipif.transport.write(slip.delimiter)