Refactor the devserver to make it easier to control caching

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

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This helps you preview the apps and extensions docs.
 #
 #    ./preview.py --help
 #
 # There are two modes: server- and render- mode. The default is server, in which
@@ skipping 10 matching lines @@
 # and for profiling the server. For example,
 #
 #    ./preview.py -r extensions/tabs.html
 #
 # will output the documentation for the tabs API on stdout and exit immediately.
 #
 # Note: absolute paths into static content (e.g. /static/css/site.css) will be
 # relative paths (e.g. static/css/site.css) for convenient sandboxing.
 
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+import logging
 import optparse
 import os
 import shutil
 from StringIO import StringIO
 import sys
 import urlparse
 
 import build_server
 # Copy all the files necessary to run the server. These are cleaned up when the
 # server quits.
 build_server.main()
 
 from fake_fetchers import ConfigureFakeFetchers
 
 class _Response(object):
   def __init__(self):
     self.status = 200
     self.out = StringIO()
     self.headers = {}
 
   def set_status(self, status):
     self.status = status
 
 class _Request(object):
   def __init__(self, path):
     self.headers = {}
     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')
   return (content, response.status, response.headers)
 
 def _GetLocalPath():
   if os.sep in sys.argv[0]:
     return os.path.join(sys.argv[0].rsplit(os.sep, 1)[0], os.pardir, os.pardir)
   return os.path.join(os.pardir, os.pardir)
 
 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)
     self.end_headers()
     self.wfile.write(content)
 
 if __name__ == '__main__':
   parser = optparse.OptionParser(
       description='Runs a server to preview the extension documentation.',
       usage='usage: %prog [option]...')
@@ skipping 21 matching lines @@
   from handler import Handler
 
   if opts.render:
     if opts.render.find('#') >= 0:
       (path, iterations) = opts.render.rsplit('#', 1)
       extra_iterations = int(iterations) - 1
     else:
       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.
     print(content.replace('/stable/static', 'static'))
     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('')
   print('  http://localhost:%s/extensions/' % opts.port)
   print('')
   print('The apps documentation can be found at:')
   print('')
   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()
   finally:
     server.socket.close()