Mercurial > piecrust2
changeset 680:c2ea75e37540
serve: Fix some crashes introduced by recent refactor.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Tue, 08 Mar 2016 01:05:39 -0800 |
| parents | 15b6ffadc95f |
| children | 894d286b348f |
| files | piecrust/serving/middlewares.py piecrust/serving/procloop.py piecrust/serving/server.py |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/serving/middlewares.py Mon Mar 07 00:03:13 2016 -0800 +++ b/piecrust/serving/middlewares.py Tue Mar 08 01:05:39 2016 -0800 @@ -47,7 +47,7 @@ self.run_sse_check = run_sse_check self._proc_loop = None self._out_dir = os.path.join( - root_dir, CACHE_DIR, appfactory.cache_key, 'server') + appfactory.root_dir, CACHE_DIR, appfactory.cache_key, 'server') self._handlers = { 'debug_info': self._getDebugInfo, 'werkzeug_shutdown': self._shutdownWerkzeug,
--- a/piecrust/serving/procloop.py Mon Mar 07 00:03:13 2016 -0800 +++ b/piecrust/serving/procloop.py Tue Mar 08 01:05:39 2016 -0800 @@ -75,10 +75,11 @@ class ProcessingLoop(threading.Thread): - def __init__(self, appfactory): + def __init__(self, appfactory, out_dir): super(ProcessingLoop, self).__init__( name='pipeline-reloader', daemon=True) self.appfactory = appfactory + self.out_dir = out_dir self.last_status_id = 0 self.interval = 1 self.app = None @@ -90,10 +91,9 @@ self._last_config_mtime = 0 self._obs = [] self._obs_lock = threading.Lock() - if appfactory.theme_site: - self._config_path = os.path.join(root_dir, THEME_CONFIG_PATH) - else: - self._config_path = os.path.join(root_dir, CONFIG_PATH) + config_name = ( + THEME_CONFIG_PATH if appfactory.theme_site else CONFIG_PATH) + self._config_path = os.path.join(appfactory.root_dir, config_name) def addObserver(self, obs): with self._obs_lock:
--- a/piecrust/serving/server.py Mon Mar 07 00:03:13 2016 -0800 +++ b/piecrust/serving/server.py Tue Mar 08 01:05:39 2016 -0800 @@ -90,7 +90,7 @@ response = self._try_run_request(environ) return response(environ, start_response) except Exception as ex: - if self.debug: + if self.appfactory.debug: raise return self._handle_error(ex, environ, start_response)