dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1145 from niphlod/fix/1142

Browse Source 
fixes #1142
This commit is contained in:
mdipierro
2015-12-29 12:07:40 -06:00
parent cee0f91b36 eb49831726
commit 1ca0c9b0c0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/service/service.py
+2 -2
View File
@@ -74,7 +74,7 @@ class ServiceBase(Base):
key = config['https_key'] key = config['https_key']
cert = config['https_cert'] cert = config['https_cert']
if key != '' and cert != '': if key != '' and cert != '':
interfaces.append('%s:%s:%s:%s' % (ip, port, cert, key)) interfaces.append('%s:%s:%s:%s' % (ip, port, key, cert))
ports.append(ports) ports.append(ports)
if len(interfaces) == 0: if len(interfaces) == 0:
sys.exit('Configuration error. Must have settings for http and/or https') sys.exit('Configuration error. Must have settings for http and/or https')
@@ -92,7 +92,7 @@ class ServiceBase(Base):
interfaces = ';'.join(interfaces) interfaces = ';'.join(interfaces)
args.append('--interfaces=%s' % interfaces) args.append('--interfaces=%s' % interfaces)
if 'log_filename' in config.key(): if 'log_filename' in config.keys():
log_filename = config['log_filename'] log_filename = config['log_filename']
args.append('--log_filename=%s' % log_filename) args.append('--log_filename=%s' % log_filename)