diff options
| -rw-r--r-- | CHANGES.txt | 11 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ea86526b0..5f55c7f72 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,14 @@ +Next release +============ + +Bug Fixes +--------- + +- The process will now restart when ``pserve`` is used with the ``--reload`` + flag when the ``development.ini`` file (any any other .ini file in use) is + changed. See https://github.com/Pylons/pyramid/issues/377 and + https://github.com/Pylons/pyramid/pull/411 + 1.3a6 (2012-01-20) ================== diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index a73cbde3a..087549cd2 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -173,7 +173,7 @@ class PServeCommand(object): if os.environ.get(self._reloader_environ_key): if self.verbose > 1: self.out('Running reloading file monitor') - install_reloader(int(self.options.reload_interval)) + install_reloader(int(self.options.reload_interval), [app_spec]) # if self.requires_config_file: # watch_file(self.args[0]) else: @@ -667,7 +667,7 @@ def _turn_sigterm_into_systemexit(): # pragma: no cover raise SystemExit signal.signal(signal.SIGTERM, handle_term) -def install_reloader(poll_interval=1): # pragma: no cover +def install_reloader(poll_interval=1, extra_files=None): # pragma: no cover """ Install the reloading monitor. @@ -677,6 +677,9 @@ def install_reloader(poll_interval=1): # pragma: no cover which causes the whole application to shut-down (rudely). """ mon = Monitor(poll_interval=poll_interval) + if extra_files is None: + extra_files = [] + mon.extra_files.extend(extra_files) t = threading.Thread(target=mon.periodic_reload) t.setDaemon(True) t.start() |