Merge pull request #2118 from mmerickel/fix/pserve-monitor-daemon

Bert JW Regeer

2015-11-13 a6b316a178d66f3d374d44eb3364adc195db0af5

Merge pull request #2118 from mmerickel/fix/pserve-monitor-daemon

fix usage of --monitor-restart with --daemon

Closes #1216

 CHANGES.txt

@@ -232,6 +232,9 @@
  shell a little more straightfoward.
  See https://github.com/Pylons/pyramid/pull/1883

- 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 @@
                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()
@@ -312,13 +315,16 @@
                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')