summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2019-01-29 00:45:11 -0600
committerMichael Merickel <michael@merickel.org>2019-01-29 00:45:11 -0600
commit36f3bf6fd7825cec102c7bbdc7d8c15c4c846c76 (patch)
treec7c4f115662a265753633245189803e7013dcb50 /src
parent7bd9da72c63124c7ca007f4fa2113633bba5c403 (diff)
downloadpyramid-36f3bf6fd7825cec102c7bbdc7d8c15c4c846c76.tar.gz
pyramid-36f3bf6fd7825cec102c7bbdc7d8c15c4c846c76.tar.bz2
pyramid-36f3bf6fd7825cec102c7bbdc7d8c15c4c846c76.zip
do not configure logging in the master process when using the reloader
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/scripts/pserve.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py
index 7d68521a4..bf5662a19 100644
--- a/src/pyramid/scripts/pserve.py
+++ b/src/pyramid/scripts/pserve.py
@@ -182,7 +182,11 @@ class PServeCommand(object):
app_name = self.args.app_name
loader = self._get_config_loader(config_uri)
- loader.setup_logging(config_vars)
+
+ # setup logging only in the worker process incase the logging config
+ # opens files which should not be opened by multiple processes at once
+ if not self.args.reload or hupper.is_active():
+ loader.setup_logging(config_vars)
self.pserve_file_config(loader, global_conf=config_vars)