summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Saddi <allan@saddi.com>2008-07-23 22:51:59 -0700
committerAllan Saddi <allan@saddi.com>2008-07-23 22:51:59 -0700
commitd2345e3aa268c0ae0c2989599635b5b45d641d97 (patch)
treec49170b96dd5d68957ea19edd57f29f5d09ef773
parent6080b5e1cace9e8e9f368471cd7a6a37795bc626 (diff)
downloadflup-d2345e3aa268c0ae0c2989599635b5b45d641d97.tar.gz
Add support for configuring UNIX domain sockets (for servers that
support them) in the paste.server_factory implementations.
-rw-r--r--ChangeLog6
-rw-r--r--flup/server/paste_factory.py6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a262fe..3f70388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-23 Allan Saddi <allan@saddi.com>
+
+ * Add support for configuring UNIX domain sockets (for servers that
+ support them) in the paste.server_factory implementations. Thanks
+ to Dan Roberts for the code.
+
2008-07-22 Allan Saddi <allan@saddi.com>
* Release 1.0.1
diff --git a/flup/server/paste_factory.py b/flup/server/paste_factory.py
index cd90b8b..2024d45 100644
--- a/flup/server/paste_factory.py
+++ b/flup/server/paste_factory.py
@@ -3,7 +3,11 @@ def helper(wsgiServerClass, global_conf, host, port, **local_conf):
host = host or global_conf.get('host', 'localhost')
port = port or global_conf.get('port', 4000)
- local_conf['bindAddress'] = (host, int(port))
+ if 'socket' in local_conf:
+ local_conf['bindAddress'] = local_conf['socket']
+ del local_conf['socket']
+ else:
+ local_conf['bindAddress'] = (host, int(port))
def server(application):
server = wsgiServerClass(application, **local_conf)