summaryrefslogtreecommitdiff
path: root/bin/tinyerp-server.py
diff options
context:
space:
mode:
authorced <>2007-11-27 15:43:56 +0000
committerced <>2007-11-27 15:43:56 +0000
commite9b7a4ef125040c506192ded3355e8a51d958629 (patch)
treefdfc2b0e6f272dfbe3d3b20e5a5329faf1aaedf6 /bin/tinyerp-server.py
parent2a527ec0a0669b7af380e2184ceb9234b8151cee (diff)
Don't launch server in non secure if secure have been ask.
bzr revid: ced-2502a6622822d5eb7f639abd6b6ac3f5334fed5d
Diffstat (limited to 'bin/tinyerp-server.py')
-rwxr-xr-xbin/tinyerp-server.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/tinyerp-server.py b/bin/tinyerp-server.py
index 77c562a82ec..1fe6f3583bf 100755
--- a/bin/tinyerp-server.py
+++ b/bin/tinyerp-server.py
@@ -215,18 +215,17 @@ if tools.config['xmlrpc']:
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 services, port "+str(port))
-
+ logger.notifyChannel("web-services", netsvc.LOG_INFO,
+ "starting XML-RPC" + \
+ (tools.config['secure'] and ' Secure' or '') + \
+ " services, port " + str(port))
+
#
#if tools.config["soap"]:
# soap_gw = netsvc.xmlrpc.RpcGateway('web-services')
# httpd.attach("/soap", soap_gw )
# logger.notifyChannel("web-services", netsvc.LOG_INFO, 'starting SOAP services, port '+str(port))
#
- if not (netsvc.HAS_SSL and tools.config['secure']):
- logger.notifyChannel("web-services", netsvc.LOG_INFO, "You are not using the SSL layer")
- else:
- logger.notifyChannel("web-services", netsvc.LOG_INFO, "You are using the SSL Layer")
if tools.config['netrpc']:
try: