jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

lock domain socket and remove on last arbiter exit

Browse Source
This commit is contained in:
Paul Fisher 2016-01-11 11:26:30 -08:00
parent 3ccdafbb62
commit 4fc3fbec33
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gunicorn/sock.py
View File

@ -4,6 +4,7 @@
# See the NOTICE for more information. # See the NOTICE for more information.
import errno import errno
import fcntl
import os import os
import socket import socket
import stat import stat
@ -105,6 +106,8 @@ class UnixSocket(BaseSocket):
raise ValueError("%r is not a socket" % addr) raise ValueError("%r is not a socket" % addr)
self.parent = os.getpid() self.parent = os.getpid()
super(UnixSocket, self).__init__(addr, conf, log, fd=fd) super(UnixSocket, self).__init__(addr, conf, log, fd=fd)
# each arbiter grabs a shared lock on the unix socket.
fcntl.lockf(self.sock, fcntl.LOCK_SH | fcntl.LOCK_NB)
def __str__(self): def __str__(self):
return "unix:%s" % self.cfg_addr return "unix:%s" % self.cfg_addr
@ -117,9 +120,17 @@ class UnixSocket(BaseSocket):
def close(self): def close(self):
super(UnixSocket, self).close()
if self.parent == os.getpid(): if self.parent == os.getpid():
os.unlink(self.cfg_addr) # attempt to acquire an exclusive lock on the unix socket.
# if we're the only arbiter running, the lock will succeed, and
# we can safely rm the socket.
try:
fcntl.lockf(self.sock, fcntl.LOCK_EX | fcntl.LOCK_NB)
except:
pass
else:
os.unlink(self.cfg_addr)
super(UnixSocket, self).close()
def _sock_type(addr): def _sock_type(addr):