chiark / gitweb /
~ian / hippotat.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4e0316)
wip
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 23 Mar 2017 19:17:27 +0000 (19:17 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 23 Mar 2017 19:17:27 +0000 (19:17 +0000)
fake-userv patch | blob | history
server patch | blob | history

diff --git a/fake-userv b/fake-userv
index 24f6aada7ba7a6fe55cc6376e09f6d2a35bde7d7..0796412e65ee454ba44e6dd5273f4b5301593f7d 100755 (executable)
--- a/fake-userv
+++ b/fake-userv
@@ -5,6 +5,5 @@ exec 3<&0 4>&1 5>&2 >&2 </dev/null
 exec xterm -T netns -e unshare -n -- sh -xc '
   "$@" <&3 >&4 2>&5 &
   sleep 0.1
-  ping 192.0.2.1 &
   env - bash -i
 ' x "$@"
diff --git a/server b/server
index e3fef89a02bf5300718b2e96cfedfdb886d39823..17dcd5d68900bf51be909e3d5c5f277e19a70cde 100755 (executable)
--- a/server
+++ b/server
@@ -135,7 +135,13 @@ def process_request(request):
 class IphttpResource(twisted.web.resource.Resource):
   isLeaf = True
   def render_POST(self, request):
-    process_request(request)
+    try: process_request(request)
+    except Exception as e:
+      request.setHeader('Content-Type','text/plain; charset="utf-8"')
+      request.setResponseCode(400)
+      request.write(str(e).encode('utf-8'))
+      request.finish
+      
   def render_GET(self, request):
     return b'<html><body>hippotat</body></html>'
 
Unnamed repository; edit this file 'description' to name the repository.