diff options
| author | Michael Merickel <michael@merickel.org> | 2015-10-14 22:40:37 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-10-14 22:40:37 -0500 |
| commit | 14a28d2dfd27aed3337fb756180befa15d94ea98 (patch) | |
| tree | 5f6b9ae6050f3232ced1ef48b8793373f50bc62a | |
| parent | 31f899a4b477888a1b3e8e7ed6b83407e6a41d20 (diff) | |
| parent | 9a68d072a440e91f5ada180404c6654e3eae93ae (diff) | |
| download | pyramid-14a28d2dfd27aed3337fb756180befa15d94ea98.tar.gz pyramid-14a28d2dfd27aed3337fb756180befa15d94ea98.tar.bz2 pyramid-14a28d2dfd27aed3337fb756180befa15d94ea98.zip | |
Merge pull request #1907 from mnaberez/circus-as-pserve-daemonize-replacement
Mention Circus as a pserve --daemon replacement. Refs #1554, #1641
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 8ed3e1137..b71af30cb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -218,8 +218,8 @@ Deprecations Please use a real process manager in the future instead of relying on the ``pserve`` to daemonize itself. Many options exist including your Operating - System's services such as systemd or upstart, as well as the excellent - and simple supervisord. + System's services such as Systemd or Upstart, as well as Python-based + solutions like Circus and Supervisor. See https://github.com/Pylons/pyramid/pull/1641 diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index a30ea5985..094a811a4 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -622,7 +622,7 @@ class PServeCommand(object): self.out('''\ The daemon options have been deprecated in Pyramid 1.6. They will be removed in a future release per Pyramid's deprecation policy. Please consider using -a real process manager for handling your processes like supervisord or systemd. +a real process manager for your processes like Systemd, Circus, or Supervisor. The following commands are deprecated: [start,stop,restart,status] --daemon, --stop-server, --status, --pid-file |