Merge branch 'master' into feature/int_conversion_check

CHANGES.txt

@@ -237,6 +237,9 @@ Bug Fixes
   ``timeout``, ``reissue_time``, ``max_age`` that expect an integer value.
   See https://github.com/Pylons/pyramid/pull/2050
 
+- Fixed usage of ``pserve --monitor-restart --daemon`` which would fail in
+  horrible ways. See https://github.com/Pylons/pyramid/pull/2118
+
 Deprecations
 ------------
 

pyramid/scripts/pserve.py

@@ -302,7 +302,10 @@ def run(self):  # pragma: no cover
                 raise ValueError(msg)
             writeable_pid_file.close()
 
-        if getattr(self.options, 'daemon', False):
+        if (
+            getattr(self.options, 'daemon', False) and
+            not os.environ.get(self._monitor_environ_key)
+        ):
             self._warn_daemon_deprecated()
             try:
                 self.daemonize()
@@ -311,15 +314,18 @@ def run(self):  # pragma: no cover
                     self.out(str(ex))
                 return 2
 
+        if (
+            not os.environ.get(self._monitor_environ_key) and
+            self.options.pid_file
+        ):
+            self.record_pid(self.options.pid_file)
+
         if (
                 self.options.monitor_restart and
                 not os.environ.get(self._monitor_environ_key)
         ):
             return self.restart_with_monitor()
 
-        if self.options.pid_file:
-            self.record_pid(self.options.pid_file)
-
         if self.options.log_file:
             stdout_log = LazyWriter(self.options.log_file, 'a')
             sys.stdout = stdout_log