web: fix broken GETs and test

[bup.git] / cmd / web-cmd.py

diff --git a/cmd/web-cmd.py b/cmd/web-cmd.py
index f88bbc7115fc6109f16fa2d1c3ba7037852eb110..47817f0e3cdf82182630303e59034cef071a2f30 100755 (executable)
--- a/cmd/web-cmd.py
+++ b/cmd/web-cmd.py
@@ -13,6 +13,7 @@ from bup.helpers import (chunkyreader, debug1, handle_ctrl_c, log,
                          resource_path, saved_errors)
 
 try:
+    from tornado import gen
     from tornado.httpserver import HTTPServer
     from tornado.ioloop import IOLoop
     from tornado.netutil import bind_unix_socket
@@ -89,7 +90,6 @@ class BupRequestHandler(tornado.web.RequestHandler):
     def head(self, path):
         return self._process_request(path)
     
-    @tornado.web.asynchronous
     def _process_request(self, path):
         path = urllib.unquote(path)
         print 'Handling request for %s' % path
@@ -127,6 +127,7 @@ class BupRequestHandler(tornado.web.RequestHandler):
             hidden_shown=show_hidden,
             dir_contents=_compute_dir_contents(n, path, show_hidden))
 
+    @gen.coroutine
     def _get_file(self, path, n):
         """Process a request on a file.
 
@@ -134,30 +135,21 @@ class BupRequestHandler(tornado.web.RequestHandler):
         In either case, the headers are sent.
         """
         ctype = self._guess_type(path)
-
         self.set_header("Last-Modified", self.date_time_string(n.mtime))
         self.set_header("Content-Type", ctype)
         size = n.size()
         self.set_header("Content-Length", str(size))
         assert(len(n.hash) == 20)
         self.set_header("Etag", n.hash.encode('hex'))
-
         if self.request.method != 'HEAD':
-            self.flush()
             f = n.open()
-            it = chunkyreader(f)
-            def write_more(me):
-                try:
-                    blob = it.next()
-                except StopIteration:
-                    f.close()
-                    self.finish()
-                    return
-                self.request.connection.stream.write(blob,
-                                                     callback=lambda: me(me))
-            write_more(write_more)
-        else:
-            self.finish()
+            try:
+                it = chunkyreader(f)
+                for blob in chunkyreader(f):
+                    self.write(blob)
+            finally:
+                f.close()
+        raise gen.Return()
 
     def _guess_type(self, path):
         """Guess the type of a file.