codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

call check_ssl_keys prior to listenSSL

This commit is contained in:
Damien Churchill 2009-08-03 21:41:53 +00:00
parent ee573b4816
commit ea57cad95b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deluge/ui/web/server.py
View File

@ -46,11 +46,12 @@ import mimetypes
import pkg_resources import pkg_resources
from twisted.application import service, internet from twisted.application import service, internet
from twisted.internet import reactor, error from twisted.internet import reactor, defer, error
from twisted.internet.ssl import SSL from twisted.internet.ssl import SSL
from twisted.web import http, resource, server, static from twisted.web import http, resource, server, static
from deluge import common, component, configmanager from deluge import common, component, configmanager
from deluge.core.rpcserver import check_ssl_keys
from deluge.log import setupLogger, LOG as _log from deluge.log import setupLogger, LOG as _log
from deluge.ui import common as uicommon from deluge.ui import common as uicommon
from deluge.ui.tracker_icons import TrackerIcons from deluge.ui.tracker_icons import TrackerIcons
@ -483,6 +484,7 @@ class DelugeWeb(component.Component):
self.port, self.port) self.port, self.port)
def start_ssl(self): def start_ssl(self):
check_ssl_keys()
self.socket = reactor.listenSSL(self.port, self.site, ServerContextFactory()) self.socket = reactor.listenSSL(self.port, self.site, ServerContextFactory())
log.info("serving on %s:%s view at https://127.0.0.1:%s", "0.0.0.0", log.info("serving on %s:%s view at https://127.0.0.1:%s", "0.0.0.0",
self.port, self.port) self.port, self.port)
@ -492,9 +494,14 @@ class DelugeWeb(component.Component):
self.plugins.disable_plugins() self.plugins.disable_plugins()
log.debug("Saving configuration file") log.debug("Saving configuration file")
self.config.save() self.config.save()
if self.socket: if self.socket:
self.socket.stopListening() d = self.socket.stopListening()
self.socket = None self.socket = None
else:
d = defer.Deferred()
d.callback(False)
return d
def shutdown(self, *args): def shutdown(self, *args):
self.stop() self.stop()