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

[FIX] http[s]-server: made startup message different for HTTPS 

bzr revid: odo@openerp.com-20100616154904-99erlidceq3menel
This commit is contained in:
Olivier Dony 2010-06-16 17:49:04 +02:00
parent ebb2a2b364
commit 6747bdc080
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/service/http_server.py
View File

@ -120,10 +120,6 @@ class BaseHttpDaemon(threading.Thread, netsvc.Server):
self.server = ThreadedHTTPServer((interface, port), handler)
self.server.vdirs = []
self.server.logRequests = True
netsvc.Logger().notifyChannel(
"web-services", netsvc.LOG_INFO,
"starting HTTPS service at %s port %d" %
(interface or '0.0.0.0', port,))
except Exception, e:
netsvc.Logger().notifyChannel(
'httpd', netsvc.LOG_CRITICAL,
@ -155,6 +151,10 @@ class HttpDaemon(BaseHttpDaemon):
def __init__(self, interface, port):
super(HttpDaemon, self).__init__(interface, port,
handler=MultiHandler2)
netsvc.Logger().notifyChannel(
"web-services", netsvc.LOG_INFO,
"starting HTTP service at %s port %d" %
(interface or '0.0.0.0', port,))
class HttpSDaemon(BaseHttpDaemon):
def __init__(self, interface, port):
@ -166,6 +166,10 @@ class HttpSDaemon(BaseHttpDaemon):
'httpd-ssl', netsvc.LOG_CRITICAL,
"Can not load the certificate and/or the private key files")
raise
netsvc.Logger().notifyChannel(
"web-services", netsvc.LOG_INFO,
"starting HTTPS service at %s port %d" %
(interface or '0.0.0.0', port,))
httpd = None
httpsd = None