Skip to content
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

Move server socket teardown to an atexit handler #155

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Move server socket teardown to an atexit handler #155

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0dc1f4
Move socket handling to an atexit handler
Mar 16, 2019
5f38de0
Add missing sock declaration
May 18, 2019
eb20e3e
Handle socket closure in all cases
May 18, 2019
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
25 changes: 16 additions & 9 deletions bjoern.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import atexit
import os
import socket
import _bjoern
Expand Down Expand Up @@ -38,6 +39,18 @@ def server_run(sock, wsgi_app):
_bjoern.server_run(sock, wsgi_app)


def _close_server_socket():
# Handler for cleaning up the server socket when the process terminates
global _default_instance

if sock.family == socket.AF_UNIX:
samipfjo marked this conversation as resolved.
Show resolved Hide resolved
filename = sock.getsockname()
if filename[0] != '\0':
os.unlink(sock.getsockname())
sock.close()
_default_instance = None


# Backwards compatibility API
def listen(wsgi_app, host, port=None, reuse_port=False):
"""
Expand Down Expand Up @@ -73,12 +86,6 @@ def run(*args, **kwargs):
"before calling bjoern.run() without arguments.")

sock, wsgi_app = _default_instance
try:
server_run(sock, wsgi_app)
finally:
if sock.family == socket.AF_UNIX:
filename = sock.getsockname()
if filename[0] != '\0':
os.unlink(sock.getsockname())
sock.close()
_default_instance = None
atexit.register(_close_server_socket)

server_run(sock, wsgi_app)