summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Naberezny <mike@naberezny.com>2015-10-01 14:18:10 -0700
committerMike Naberezny <mike@naberezny.com>2015-10-01 14:24:11 -0700
commit9a68d072a440e91f5ada180404c6654e3eae93ae (patch)
tree182bad061dd1f8419d6c2bcbeeccfed99edd1013
parent7bdace149978504d6e26ea8d095927e15bbf7ab6 (diff)
downloadpyramid-9a68d072a440e91f5ada180404c6654e3eae93ae.tar.gz
pyramid-9a68d072a440e91f5ada180404c6654e3eae93ae.tar.bz2
pyramid-9a68d072a440e91f5ada180404c6654e3eae93ae.zip
Mention Circus as a pserve --daemon replacement. Refs #1554, #1641
-rw-r--r--CHANGES.txt4
-rw-r--r--pyramid/scripts/pserve.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c8a9080a..2f8c455d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -215,8 +215,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