Skip to content

clean up code for different gunicorn versions #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

clean up code for different gunicorn versions #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 63 additions & 115 deletions socketio/sgunicorn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,134 +49,82 @@ def __init__(self, age, ppid, socket, app, timeout, cfg, log):
super(GeventSocketIOBaseWorker, self).__init__(
age, ppid, socket, app, timeout, cfg, log)

def run(self):
if gunicorn_version >= (0, 17, 0):
servers = []
ssl_args = {}

if self.cfg.is_ssl:
ssl_args = dict(
server_side=True,
do_handshake_on_connect=False,
**self.cfg.ssl_options
)

for s in self.sockets:
s.setblocking(1)
pool = Pool(self.worker_connections)
if self.server_class is not None:
self.server_class.base_env['wsgi.multiprocess'] = \
self.cfg.workers > 1

server = self.server_class(
s,
application=self.wsgi,
spawn=pool,
resource=self.resource,
log=self.log,
policy_server=self.policy_server,
handler_class=self.wsgi_handler,
ws_handler_class=self.ws_wsgi_handler,
**ssl_args
)
else:
hfun = partial(self.handle, s)
server = StreamServer(
s, handle=hfun, spawn=pool, **ssl_args)

server.start()
servers.append(server)

pid = os.getpid()
try:
while self.alive:
self.notify()

if pid == os.getpid() and self.ppid != os.getppid():
self.log.info(
"Parent changed, shutting down: %s", self)
break

gevent.sleep(1.0)

except KeyboardInterrupt:
pass

try:
# Stop accepting requests
[server.stop_accepting() for server in servers]

# Handle current requests until graceful_timeout
ts = time.time()
while time.time() - ts <= self.cfg.graceful_timeout:
accepting = 0
for server in servers:
if server.pool.free_count() != server.pool.size:
accepting += 1

if not accepting:
return

self.notify()
gevent.sleep(1.0)

# Force kill all active the handlers
self.log.warning("Worker graceful timeout (pid:%s)" % self.pid)
[server.stop(timeout=1) for server in servers]
except:
pass
else:
self.socket.setblocking(1)
pool = Pool(self.worker_connections)
self.server_class.base_env['wsgi.multiprocess'] = \
self.cfg.workers > 1
def _start_server(self, socket, ssl_args={}):
socket.setblocking(1)
pool = Pool(self.worker_connections)
if self.server_class is not None:
self.server_class.base_env['wsgi.multiprocess'] = self.cfg.workers > 1

server = self.server_class(
self.socket,
socket,
application=self.wsgi,
spawn=pool,
resource=self.resource,
log=self.log,
policy_server=self.policy_server,
handler_class=self.wsgi_handler,
ws_handler_class=self.ws_wsgi_handler,
**ssl_args
)
else:
hfun = partial(self.handle, socket)
server = StreamServer(socket, handle=hfun, spawn=pool, **ssl_args)

server.start()
return server

def _run_server(self):
pid = os.getpid()
try:
while self.alive:
self.notify()

if pid == os.getpid() and self.ppid != os.getppid():
self.log.info("Parent changed, shutting down: %s", self)
break

gevent.sleep(1.0)

except KeyboardInterrupt:
pass

def _stop_servers(self, servers):
try:
# Stop accepting requests
for server in servers:
server.stop_accepting()

# Handle current requests until graceful_timeout
ts = time.time()
while time.time() - ts <= self.cfg.graceful_timeout:
servers = [server for server in servers
if server.pool.free_count() != server.pool.size]
if not servers:
break

self.notify()
gevent.sleep(1.0)
else:
# Force kill all active the handlers
self.log.warning("Worker graceful timeout (pid:%s)" % self.pid)
for server in servers:
server.stop(timeout=1)
except:
pass

server.start()
pid = os.getpid()

try:
while self.alive:
self.notify()

if pid == os.getpid() and self.ppid != os.getppid():
self.log.info(
"Parent changed, shutting down: %s", self)
break

gevent.sleep(1.0)

except KeyboardInterrupt:
pass

try:
# Stop accepting requests
server.kill()

# Handle current requests until graceful_timeout
ts = time.time()
while time.time() - ts <= self.cfg.graceful_timeout:
if server.pool.free_count() == server.pool.size:
return # all requests was handled
def run(self):
if gunicorn_version >= (0, 17, 0):
ssl_args = {}

self.notify()
gevent.sleep(1.0)
if self.cfg.is_ssl:
ssl_args = dict(server_side=True,
do_handshake_on_connect=False, **self.cfg.ssl_options)

# Force kill all active the handlers
self.log.warning("Worker graceful timeout (pid:%s)" % self.pid)
server.stop(timeout=1)
except:
pass
servers = [self._start_server(s, ssl_args) for s in self.sockets]
else:
servers = [self._start_server(self.socket)]
self._run_server()
self._stop_servers(servers)


class GeventSocketIOWorker(GeventSocketIOBaseWorker):
Expand Down