diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-22 16:20:21 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-22 16:20:21 +0200 |
| commit | 46a8ab54fd0d6a6d8303b05945784267c77aafd7 (patch) | |
| tree | 62980a7a7529db5b1de040095f1551af28f42b4b /pyLoadCore.py | |
| parent | fixes (diff) | |
| download | pyload-46a8ab54fd0d6a6d8303b05945784267c77aafd7.tar.xz | |
fixes, 2nd icon
Diffstat (limited to 'pyLoadCore.py')
| -rwxr-xr-x | pyLoadCore.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pyLoadCore.py b/pyLoadCore.py index 79fc7d565..e140b42a3 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -160,7 +160,7 @@ class Core(object): print "Setup failed" if not res: remove("pyload.conf") - exit() + exit() try: signal.signal(signal.SIGQUIT, self.quit) except: pass @@ -257,8 +257,13 @@ class Core(object): server_addr = (self.config['remote']['listenaddr'], int(self.config['remote']['port'])) usermap = {self.config.username: self.config.password} if self.config['ssl']['activated']: - self.server = Server.SecureXMLRPCServer(server_addr, self.config['ssl']['cert'], self.config['ssl']['key'], usermap) - self.log.info(_("Secure XMLRPC Server Started")) + if exists(self.config['ssl']['cert']) and exists(self.config['ssl']['key']): + self.server = Server.SecureXMLRPCServer(server_addr, self.config['ssl']['cert'], self.config['ssl']['key'], usermap) + self.log.info(_("Secure XMLRPC Server Started")) + else: + self.log.warning(_("SSL Certificates not found, fallback to auth XMLRPC server")) + self.server = Server.AuthXMLRPCServer(server_addr, usermap) + self.log.info(_("Auth XMLRPC Server Started")) else: self.server = Server.AuthXMLRPCServer(server_addr, usermap) self.log.info(_("Auth XMLRPC Server Started")) |