summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-11-12 21:41:07 -0600
committerMichael Merickel <michael@merickel.org>2015-11-12 23:15:19 -0600
commit54251241c8f52dbe88d6ee21df9f2018fbd7c0d9 (patch)
treefb04bfd0fe4a4b8e2333b1c21607ce9625874c9b
parenta6b316a178d66f3d374d44eb3364adc195db0af5 (diff)
downloadpyramid-54251241c8f52dbe88d6ee21df9f2018fbd7c0d9.tar.gz
pyramid-54251241c8f52dbe88d6ee21df9f2018fbd7c0d9.tar.bz2
pyramid-54251241c8f52dbe88d6ee21df9f2018fbd7c0d9.zip
abort when using reload with daemon
-rw-r--r--pyramid/scripts/pserve.py4
1 files changed, 4 insertions, 0 deletions
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')