diff options
| author | Frank Krick <frank.krick@gmail.com> | 2018-11-13 13:33:11 -0500 |
|---|---|---|
| committer | Frank Krick <frank.krick@gmail.com> | 2018-11-13 13:33:11 -0500 |
| commit | 0bb7a3e0e76ee050c9b83dd38b10dcdefa1e2563 (patch) | |
| tree | c2c146dbc8881a870126d4c4410bd3ceb1964794 | |
| parent | ddc230d2afc3e47e8d4c1dac80f100bcc7102655 (diff) | |
| download | waitress-0bb7a3e0e76ee050c9b83dd38b10dcdefa1e2563.tar.gz | |
Changes for pull request review
| -rw-r--r-- | docs/socket-activation.rst | 5 | ||||
| -rw-r--r-- | waitress/server.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/socket-activation.rst b/docs/socket-activation.rst index 27f856b..b797c90 100644 --- a/docs/socket-activation.rst +++ b/docs/socket-activation.rst @@ -2,8 +2,9 @@ Socket Activation ----------------- While waitress does not support the various implementations of socket activation, -for example using systemd or launchd, it is prepared to receive pre-bound applications -from an init system. +for example using systemd or launchd, it is prepared to receive pre-bound sockets +from init systems, process and socket managers or other launchers that can provide +pre-bound sockets. The following shows a code example starting waitress with three different pre-bound sockets. diff --git a/waitress/server.py b/waitress/server.py index 05d5480..7ef930e 100644 --- a/waitress/server.py +++ b/waitress/server.py @@ -111,7 +111,7 @@ def create_server(application, # We are running a single server, so we can just return the last server, # saves us from having to create one more object - if len(adj.listen) == 1 and len(adj.sockets) == 0 or len(adj.sockets) == 1: + if len(effective_listen) == 1: # In this case we have no need to use a MultiSocketServer return last_serv |