summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-20 11:53:43 +0000
committerGerrit Code Review <review@openstack.org>2015-01-20 11:53:43 +0000
commit505daa1bf04f299b71ef8954120ba48f996f555c (patch)
tree10b5a5e35db37398ab42c577f6db7faf984a0652
parente91a31d9206515b9f199368b3f1492575f5fae71 (diff)
parent508eacdd00b41242ce2cc36e995531633c35b1df (diff)
downloadgear-505daa1bf04f299b71ef8954120ba48f996f555c.tar.gz
Merge "Support binding to a specified host name or address"
-rw-r--r--gear/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gear/__init__.py b/gear/__init__.py
index 0cab110..b0e3773 100644
--- a/gear/__init__.py
+++ b/gear/__init__.py
@@ -2385,6 +2385,8 @@ class Server(BaseClientServer):
gear.Server.server_id). Defaults to None (unused).
:arg ACL acl: An :py:class:`ACL` object if the server should apply
access control rules to its connections.
+ :arg str host: Host name or IPv4/IPv6 address to bind to. Defaults
+ to "whatever getaddrinfo() returns", which might be IPv4-only.
"""
edge_bitmask = select.EPOLLET
@@ -2394,7 +2396,7 @@ class Server(BaseClientServer):
def __init__(self, port=4730, ssl_key=None, ssl_cert=None, ssl_ca=None,
statsd_host=None, statsd_port=8125, statsd_prefix=None,
- server_id=None, acl=None):
+ server_id=None, acl=None, host=None):
self.port = port
self.ssl_key = ssl_key
self.ssl_cert = ssl_cert
@@ -2415,7 +2417,7 @@ class Server(BaseClientServer):
if all([self.ssl_key, self.ssl_cert, self.ssl_ca]):
self.use_ssl = True
- for res in socket.getaddrinfo(None, self.port, socket.AF_UNSPEC,
+ for res in socket.getaddrinfo(host, self.port, socket.AF_UNSPEC,
socket.SOCK_STREAM, 0,
socket.AI_PASSIVE):
af, socktype, proto, canonname, sa = res