Author: damoxc
Revision: 5624
Log:
call check_ssl_keys prior to listenSSL
Diff:
Modified: trunk/deluge/ui/web/server.py
===================================================================
--- trunk/deluge/ui/web/server.py 2009-08-03 21:39:06 UTC (rev 5623)
+++ trunk/deluge/ui/web/server.py 2009-08-03 21:41:53 UTC (rev 5624)
@@ -46,11 +46,12 @@
import pkg_resources
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.web import http, resource, server, static
from deluge import common, component, configmanager
+from deluge.core.rpcserver import check_ssl_keys
from deluge.log import setupLogger, LOG as _log
from deluge.ui import common as uicommon
from deluge.ui.tracker_icons import TrackerIcons
@@ -483,6 +484,7 @@
self.port, self.port)
def start_ssl(self):
+ check_ssl_keys()
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",
self.port, self.port)
@@ -492,9 +494,14 @@
self.plugins.disable_plugins()
log.debug("Saving configuration file")
self.config.save()
+
if self.socket:
- self.socket.stopListening()
+ d = self.socket.stopListening()
self.socket = None
+ else:
+ d = defer.Deferred()
+ d.callback(False)
+ return d
def shutdown(self, *args):
self.stop()
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
