|
@@ -77,6 +77,7 @@ def start_server(options):
|
|
|
Start CherryPy server
|
|
Start CherryPy server
|
|
|
"""
|
|
"""
|
|
|
from desktop.lib.wsgiserver import CherryPyWSGIServer as Server
|
|
from desktop.lib.wsgiserver import CherryPyWSGIServer as Server
|
|
|
|
|
+ from desktop.lib.wsgiserver import SSLConnection
|
|
|
from django.core.handlers.wsgi import WSGIHandler
|
|
from django.core.handlers.wsgi import WSGIHandler
|
|
|
# Translogger wraps a WSGI app with Apache-style combined logging.
|
|
# Translogger wraps a WSGI app with Apache-style combined logging.
|
|
|
server = Server(
|
|
server = Server(
|
|
@@ -100,6 +101,11 @@ def start_server(options):
|
|
|
try:
|
|
try:
|
|
|
server.bind_server()
|
|
server.bind_server()
|
|
|
drop_privileges_if_necessary(options)
|
|
drop_privileges_if_necessary(options)
|
|
|
|
|
+
|
|
|
|
|
+ if isinstance(server.socket, SSLConnection):
|
|
|
|
|
+ ciphers = server.socket.get_cipher_list()
|
|
|
|
|
+ logging.info(_("List of enabled ciphers: {}").format(':'.join(ciphers)))
|
|
|
|
|
+
|
|
|
server.listen_and_loop()
|
|
server.listen_and_loop()
|
|
|
except KeyboardInterrupt:
|
|
except KeyboardInterrupt:
|
|
|
server.stop()
|
|
server.stop()
|
|
@@ -121,8 +127,7 @@ def runcpserver(argset=[], **kwargs):
|
|
|
return
|
|
return
|
|
|
|
|
|
|
|
# Start the webserver
|
|
# Start the webserver
|
|
|
- print(_('starting server with options:'))
|
|
|
|
|
- pprint.pprint(options)
|
|
|
|
|
|
|
+ logging.info(_("Starting server with options:\n{}").format(pprint.pformat(options)))
|
|
|
|
|
|
|
|
start_server(options)
|
|
start_server(options)
|
|
|
|
|
|