Mercurial > piecrust2

diff piecrust/serving/wrappers.py @ 553:cc6f3dbe3048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
serve: Extract some of the server's functionality into WSGI middlewares.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 08 Aug 2015 22:01:47 -0700
parents 9612cfc6455a
children 9ab005db2592
line wrap: on
line diff
--- a/piecrust/serving/wrappers.py	Sat Aug 08 16:12:04 2015 -0700
+++ b/piecrust/serving/wrappers.py	Sat Aug 08 22:01:47 2015 -0700
@@ -2,7 +2,6 @@
 import logging
 import threading
 import urllib.request
-from piecrust.serving.server import Server
 
 
 logger = logging.getLogger(__name__)
@@ -90,8 +89,15 @@
     app_wrapper.run()
 
 
-def _get_piecrust_server(root_dir, **kwargs):
-    server = Server(root_dir, **kwargs)
-    app = server.getWsgiApp()
+def _get_piecrust_server(root_dir, debug=False, sub_cache_dir=None,
+                         run_sse_check=None):
+    from piecrust.serving.middlewares import (
+            StaticResourcesMiddleware, PieCrustDebugMiddleware)
+    from piecrust.serving.server import WsgiServer
+    app = WsgiServer(root_dir, debug=debug, sub_cache_dir=sub_cache_dir)
+    app = StaticResourcesMiddleware(app)
+    app = PieCrustDebugMiddleware(app, root_dir,
+                                  sub_cache_dir=sub_cache_dir,
+                                  run_sse_check=run_sse_check)
     return app