1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-26 18:10:30 +00:00

Merge remote-tracking branch 'socket-activation/socket-activated'

This commit is contained in:
Ozzie Isaacs 2023-10-29 08:20:03 +01:00
commit d877fa1c68

View File

@ -27,6 +27,7 @@ try:
from gevent.pywsgi import WSGIServer from gevent.pywsgi import WSGIServer
from .gevent_wsgi import MyWSGIHandler from .gevent_wsgi import MyWSGIHandler
from gevent.pool import Pool from gevent.pool import Pool
from gevent.socket import socket as GeventSocket
from gevent import __version__ as _version from gevent import __version__ as _version
from greenlet import GreenletExit from greenlet import GreenletExit
import ssl import ssl
@ -95,6 +96,11 @@ class WebServer(object):
log.warning('Cert path: %s', certfile_path) log.warning('Cert path: %s', certfile_path)
log.warning('Key path: %s', keyfile_path) log.warning('Key path: %s', keyfile_path)
def _make_gevent_socket_activated(self):
# Reuse an already open socket on fd=SD_LISTEN_FDS_START
SD_LISTEN_FDS_START = 3
return GeventSocket(fileno=SD_LISTEN_FDS_START)
def _make_gevent_unix_socket(self, socket_file): def _make_gevent_unix_socket(self, socket_file):
# the socket file must not exist prior to bind() # the socket file must not exist prior to bind()
if os.path.exists(socket_file): if os.path.exists(socket_file):
@ -115,6 +121,10 @@ class WebServer(object):
def _make_gevent_socket(self): def _make_gevent_socket(self):
if os.name != 'nt': if os.name != 'nt':
socket_activated = os.environ.get("LISTEN_FDS")
if socket_activated:
sock = self._make_gevent_socket_activated()
return sock, sock.getsockname()
unix_socket_file = os.environ.get("CALIBRE_UNIX_SOCKET") unix_socket_file = os.environ.get("CALIBRE_UNIX_SOCKET")
if unix_socket_file: if unix_socket_file:
return self._make_gevent_unix_socket(unix_socket_file), "unix:" + unix_socket_file return self._make_gevent_unix_socket(unix_socket_file), "unix:" + unix_socket_file