diff options
| author | Michael Merickel <github@m.merickel.org> | 2019-01-29 22:41:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 22:41:55 -0800 |
| commit | 1035ca1086ee86d3ce4f207bd3c9b55d5484170b (patch) | |
| tree | 9ae4eefa25d64f2ae4bcebb38c054c7f68e2590e /src | |
| parent | 32714630c4c84a411c1b773e0f736579c142df9c (diff) | |
| parent | 36f3bf6fd7825cec102c7bbdc7d8c15c4c846c76 (diff) | |
| download | pyramid-1035ca1086ee86d3ce4f207bd3c9b55d5484170b.tar.gz pyramid-1035ca1086ee86d3ce4f207bd3c9b55d5484170b.tar.bz2 pyramid-1035ca1086ee86d3ce4f207bd3c9b55d5484170b.zip | |
Merge pull request #3459 from mmerickel/fix-logging-setup
do not configure logging in the master process when using the reloader
Diffstat (limited to 'src')
| -rw-r--r-- | src/pyramid/scripts/pserve.py | 6 |
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) |