From af6ba51820a51b4185c855de12ec33a713ecd18a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 30 Jan 2011 13:25:57 +0100 Subject: fixed ssl xmlrpc backend --- module/remote/XMLRPCBackend.py | 4 ++-- pyLoadCore.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/remote/XMLRPCBackend.py b/module/remote/XMLRPCBackend.py index 6a7f9f96e..d5f72034e 100644 --- a/module/remote/XMLRPCBackend.py +++ b/module/remote/XMLRPCBackend.py @@ -15,18 +15,18 @@ @author: mkaay, RaNaN """ +from os.path import exists import module.lib.SecureXMLRPCServer as Server from module.remote.RemoteManager import BackendBase -from traceback import print_exc - class XMLRPCBackend(BackendBase): def setup(self): server_addr = (self.core.config['remote']['listenaddr'], int(self.core.config['remote']['port'])) usermap = {self.core.config.username: self.core.config.password} if self.core.config['ssl']['activated']: if exists(self.core.config['ssl']['cert']) and exists(self.core.config['ssl']['key']): + self.core.log.info(_("Using SSL XMLRPCBackend")) self.server = Server.SecureXMLRPCServer(server_addr, self.core.config['ssl']['cert'], self.core.config['ssl']['key'], usermap) else: diff --git a/pyLoadCore.py b/pyLoadCore.py index e6574eb34..7ad0f359b 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -336,8 +336,9 @@ class Core(object): self.js = JsEngine() self.log.info(_("Downloadtime: %s") % self.server_methods.is_time_download()) - - self.remoteManager.startBackends() + + if xmlrpc: + self.remoteManager.startBackends() if web: self.init_webserver() -- cgit v1.2.3