Author: damoxc
Revision: 5510
Log:
use configmanagers get_config_dir rather than get_default_config_dir
Diff:
Modified: trunk/deluge/ui/web/server.py
===================================================================
--- trunk/deluge/ui/web/server.py 2009-07-20 09:57:17 UTC (rev 5509)
+++ trunk/deluge/ui/web/server.py 2009-07-20 10:08:29 UTC (rev 5510)
@@ -50,8 +50,7 @@
from twisted.internet.ssl import SSL
from twisted.web import http, resource, server, static
-from deluge import common, component
-from deluge.configmanager import ConfigManager
+from deluge import common, component, configmanager
from deluge.log import setupLogger, LOG as _log
from deluge.ui import common as uicommon
from deluge.ui.tracker_icons import TrackerIcons
@@ -390,17 +389,17 @@
log.debug("Enabling SSL using:")
log.debug("Pkey: %s", deluge_web.pkey)
log.debug("Cert: %s", deluge_web.cert)
- ctx.use_privatekey_file(common.get_default_config_dir(deluge_web.pkey))
-
ctx.use_certificate_file(common.get_default_config_dir(deluge_web.cert))
+ ctx.use_privatekey_file(configmanager.get_config_dir(deluge_web.pkey))
+ ctx.use_certificate_file(configmanager.get_config_dir(deluge_web.cert))
return ctx
class DelugeWeb(component.Component):
def __init__(self):
super(DelugeWeb, self).__init__("DelugeWeb")
- self.config = ConfigManager("web.conf", CONFIG_DEFAULTS)
+ self.config = configmanager.ConfigManager("web.conf", CONFIG_DEFAULTS)
- old_config = ConfigManager("webui06.conf")
+ old_config = configmanager.ConfigManager("webui06.conf")
if old_config.config:
# we have an old config file here to handle so we should move
# all the values across to the new config file, and then remove
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
