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

use configmanagers get_config_dir rather than get_default_config_dir

This commit is contained in:
Damien Churchill 2009-07-20 10:08:29 +00:00
parent 6bb4d857c2
commit 891bc9df89
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,7 @@ from twisted.internet import reactor, error
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 @@ class ServerContextFactory:
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