diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py index f99253a1e76a196abf2cde55c141a553248eab6e..3667b38c0b88211049ef77daac626b1245b39c77 100644 --- a/openerp/service/netrpc_server.py +++ b/openerp/service/netrpc_server.py @@ -108,7 +108,7 @@ class TinySocketServerThread(threading.Thread,netsvc.Server): self.socket.listen(5) self.threads = [] netsvc.Logger().notifyChannel("web-services", netsvc.LOG_INFO, - "starting NET-RPC service at %s port %d" % (interface or '0.0.0.0', port,)) + "starting NET-RPC service on %s:%s" % (interface or '0.0.0.0', port,)) def run(self): try: diff --git a/openerp/wsgi.py b/openerp/wsgi.py index 96651edf749f92a470d77725bd0f29ee6274dd25..5a8f19f8d8334ee47f04b4486ef5c33ed7ec77f2 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -302,14 +302,18 @@ def serve(): global httpd - # TODO Change the xmlrpc_port option to http_port. + # TODO Change the xmlrpc_* options to http_* + interface = config['xmlrpc_interface'] or '0.0.0.0' + port = config['xmlrpc_port'] try: import werkzeug.serving - httpd = werkzeug.serving.make_server('0.0.0.0', config['xmlrpc_port'], application, threaded=True) + httpd = werkzeug.serving.make_server(interface, port, application, threaded=True) + logging.getLogger('wsgi').info('HTTP service (werkzeug) running on %s:%s', interface, port) except ImportError, e: import wsgiref.simple_server - logging.getLogger('wsgi').warn('Can not import werkzeug, ' 'falling back to wsgiref.') - httpd = wsgiref.simple_server.make_server('0.0.0.0', config['xmlrpc_port'], application) + logging.getLogger('wsgi').warn('Werkzeug module unavailable, falling back to wsgiref.') + httpd = wsgiref.simple_server.make_server(interface, port, application) + logging.getLogger('wsgi').info('HTTP service (wsgiref) running on %s:%s', interface, port) httpd.serve_forever()