Refactor the devserver to make it easier to control caching

chrome/common/extensions/docs/server2/preview.py

Index: chrome/common/extensions/docs/server2/preview.py
diff --git a/chrome/common/extensions/docs/server2/preview.py b/chrome/common/extensions/docs/server2/preview.py
index aa7531dd40652a21fa7eb62ac7b67905a0d5f1d8..9917f5fe7b7abe00dfb190dbee7b95fde3b45982 100755
--- a/chrome/common/extensions/docs/server2/preview.py
+++ b/chrome/common/extensions/docs/server2/preview.py
@@ -28,6 +28,7 @@
 # relative paths (e.g. static/css/site.css) for convenient sandboxing.
 
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+import logging
 import optparse
 import os
 import shutil
@@ -57,11 +58,9 @@ class _Request(object):
     self.path = path
     self.url = 'http://localhost' + path
 
-def _Render(path, local_path):
+def _Render(path):
   response = _Response()
-  Handler(_Request(urlparse.urlparse(path).path),
-          response,
-          local_path=local_path).get()
+  Handler(_Request(urlparse.urlparse(path).path), response).get()
   content = response.out.getvalue()
   if isinstance(content, unicode):
     content = content.encode('utf-8', 'replace')
@@ -76,7 +75,7 @@ class RequestHandler(BaseHTTPRequestHandler):
   """A HTTPRequestHandler that outputs the docs page generated by Handler.
   """
   def do_GET(self):
-    content, status, headers = _Render(self.path, RequestHandler.local_path)
+    content, status, headers = _Render(self.path)
     self.send_response(status)
     for k, v in headers.iteritems():
       self.send_header(k, v)
@@ -118,18 +117,18 @@ if __name__ == '__main__':
       path = opts.render
       extra_iterations = 0
 
-    content, status, headers = _Render(path, opts.directory)
+    content, status, headers = _Render(path)
     if status in [301, 302]:
       # Handle a single level of redirection.
       redirect_path = headers['Location'].lstrip('/')
       sys.stderr.write('<!-- Redirected %s to %s -->\n' % (path, redirect_path))
-      content, status, headers = _Render(redirect_path, opts.directory)
+      content, status, headers = _Render(redirect_path)
     if status != 200:
       print('Error status: %s' % status)
       exit(1)
 
     for _ in range(extra_iterations):
-      _Render(path, opts.directory)
+      _Render(path)
 
     # Static paths will show up as /stable/static/foo but this only makes sense
     # from a webserver.
@@ -137,7 +136,6 @@ if __name__ == '__main__':
     exit()
 
   print('Starting previewserver on port %s' % opts.port)
-  print('Reading from %s' % opts.directory)
   print('')
   print('The extension documentation can be found at:')
   print('')
@@ -148,7 +146,7 @@ if __name__ == '__main__':
   print('  http://localhost:%s/apps/' % opts.port)
   print('')
 
-  RequestHandler.local_path = opts.directory
+  logging.getLogger().setLevel(logging.INFO)
   server = HTTPServer(('', int(opts.port)), RequestHandler)
   try:
     server.serve_forever()