diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2015-11-12 22:22:23 -0700 |
|---|---|---|
| committer | Bert JW Regeer <xistence@0x58.com> | 2015-11-12 22:22:23 -0700 |
| commit | bd52b68df1c4a754a6cf3891c53c7b34812cc3be (patch) | |
| tree | c3fd60baf6fadd2c9048f3e0dc511e4654e6ac22 | |
| parent | a6b316a178d66f3d374d44eb3364adc195db0af5 (diff) | |
| parent | 03465e75ba938a11e9f9c85b7829f7dea9713642 (diff) | |
| download | pyramid-bd52b68df1c4a754a6cf3891c53c7b34812cc3be.tar.gz pyramid-bd52b68df1c4a754a6cf3891c53c7b34812cc3be.tar.bz2 pyramid-bd52b68df1c4a754a6cf3891c53c7b34812cc3be.zip | |
Merge pull request #2119 from mmerickel/fix/prevent-reload-daemon
abort when using reload with daemon
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 77b8e9298..a17c7e1e6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -235,6 +235,10 @@ Bug Fixes - Fixed usage of ``pserve --monitor-restart --daemon`` which would fail in horrible ways. See https://github.com/Pylons/pyramid/pull/2118 +- Explicitly prevent ``pserve --reload --daemon`` from being used. It's never + been supported but would work and fail in weird ways. + See https://github.com/Pylons/pyramid/pull/2119 + Deprecations ------------ diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 63f34f6c2..42b45640c 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -225,6 +225,10 @@ class PServeCommand(object): cmd = None if self.options.reload: + if self.options.daemon or cmd in ('start', 'stop', 'restart'): + self.out( + 'Error: Cannot use reloading while running as a dameon.') + return 2 if os.environ.get(self._reloader_environ_key): if self.options.verbose > 1: self.out('Running reloading file monitor') |