django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2024-11-22 07:56:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unix socket fix (#161)

Browse Source 
Fix error on listeners when passing a unix socket
This commit is contained in:
Jonas Lidén 2018-02-06 09:04:44 +01:00 committed by Andrew Godwin
parent 3bffe981f6
commit d46429247f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daphne/server.py
View File

@ -131,7 +131,9 @@ class Server(object):
Called when a listen succeeds so we can store port details (if there are any) Called when a listen succeeds so we can store port details (if there are any)
""" """
if hasattr(port, "getHost"): if hasattr(port, "getHost"):
self.listening_addresses.append((port.getHost().host, port.getHost().port)) host = port.getHost()
if hasattr(host, "host") and hasattr(host, "port"):
self.listening_addresses.append((host.host, host.port))
def listen_error(self, failure): def listen_error(self, failure):
logger.critical("Listen failure: %s", failure.getErrorMessage()) logger.critical("Listen failure: %s", failure.getErrorMessage())

3
tests/http_base.py
View File

@ -1,3 +1,4 @@
import errno
import random import random
import socket import socket
import struct import struct
@ -31,7 +32,7 @@ class DaphneTestingInstance:
try: try:
s.bind(("127.0.0.1", port)) s.bind(("127.0.0.1", port))
except socket.error as e: except socket.error as e:
if e.errno in [13, 98]: if e.errno in [errno.EACCES, errno.EADDRINUSE]:
return True return True
else: else:
raise raise