pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

process xmlrpcs options even if ssl is disabled

Browse Source 
bzr revid: al@openerp.com-20100607125617-sz8jtlt503o40ns7
This commit is contained in:
Antony Lesuisse
2010-06-07 14:56:17 +02:00
parent 844e6ca68a
commit be2afc44ba
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/tools/config.py
+6 -13
View File
@@ -259,16 +259,10 @@ class configmanager(object):
'db_port', 'list_db', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout','smtp_ssl',
'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 'price_accuracy',
'netrpc_interface', 'netrpc_port', 'db_maxconn', 'import_partial', 'addons_path',
'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',]
if self.has_ssl:
keys.extend([
'xmlrpcs_interface',
'xmlrpcs_port',
'xmlrpcs',
'secure_cert_file',
'secure_pkey_file']
)
'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',
'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
'secure_cert_file', 'secure_pkey_file'
]
for arg in keys:
if getattr(opt, arg):
@@ -277,9 +271,8 @@ class configmanager(object):
keys = ['language', 'translate_out', 'translate_in', 'debug_mode',
'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
'list_db', 'server_actions_allow_code']
if self.has_ssl:
keys.append('xmlrpcs')
keys.append('xmlrpcs')
for arg in keys:
if getattr(opt, arg) is not None: