odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] OpenSSL is no longer required 

bzr revid: christophe@cobalt-20081219105528-geqgxmzdx9grz34t
This commit is contained in:
Christophe Simonis 2008-12-19 11:55:28 +01:00
parent a47b0aa239
commit 2b23749417
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/netsvc.py
View File

@ -324,7 +324,21 @@ class HttpDaemon(threading.Thread):
self.secure = bool(secure)
handler_class = (SimpleXMLRPCRequestHandler, SecureXMLRPCRequestHandler)[self.secure]
server_class = (SimpleThreadedXMLRPCServer, SecureThreadedXMLRPCServer)[self.secure]
self.server = server_class((interface, port), handler_class, 0)
if self.secure:
from OpenSSL.SSL import Error as SSLError
else:
class SSLError(Exception): pass
try:
self.server = server_class((interface, port), handler_class, 0)
except SSLError, e:
Logger().notifyChannel('xml-rpc-ssl', LOG_CRITICAL, "Can't load the certificate and/or the private key files")
sys.exit(1)
except Exception, e:
Logger().notifyChannel('xml-rpc', LOG_CRITICAL, "Error occur when strarting the server daemon: %s" % (e,))
sys.exit(1)
def attach(self, path, gw):
pass

17
bin/openerp-server.py
View File

@ -154,23 +154,16 @@ if tools.config['xmlrpc']:
try:
port = int(tools.config["port"])
except Exception:
logger.notifyChannel("init", netsvc.LOG_ERROR, "invalid port '%s'!" % (tools.config["port"],))
logger.notifyChannel("init", netsvc.LOG_CRITICAL, "invalid port: %r" % (tools.config["port"],))
sys.exit(1)
interface = tools.config["interface"]
secure = tools.config["secure"]
import OpenSSL
httpd = netsvc.HttpDaemon(interface, port, secure)
try:
httpd = netsvc.HttpDaemon(interface, port, secure)
except OpenSSL.SSL.Error, error:
logger.notifyChannel('xml-rpc-ssl', netsvc.LOG_CRITICAL, "Can't load the certificate and/or the private key files" )
sys.exit(1)
if tools.config["xmlrpc"]:
xml_gw = netsvc.xmlrpc.RpcGateway('web-services')
httpd.attach("/xmlrpc", xml_gw)
logger.notifyChannel("web-services", netsvc.LOG_INFO, "starting XML-RPC%s services, port %s" % ((tools.config['secure'] and ' Secure' or ''), port))
xml_gw = netsvc.xmlrpc.RpcGateway('web-services')
httpd.attach("/xmlrpc", xml_gw)
logger.notifyChannel("web-services", netsvc.LOG_INFO, "starting XML-RPC%s services, port %s" % ((tools.config['secure'] and ' Secure' or ''), port))
#
#if tools.config["soap"]: