Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log "https" if using SSL

Browse Source 
When starting the Watcher API service, the URI it served to is shown in
a log message. In this log message (in watcher/cmd/api.py) take into
account the case where SSL has been enabled with CONF.api.enable_ssl_api
set to True and format this log message accordingly.

Change-Id: I98541810139d9d4319ac89f21a5e0bc25454ee62
Closes-Bug: #1580044
This commit is contained in:
Yosef Hoffman
2016-05-10 11:44:56 -04:00
parent eb861f86ab
commit 76e3d2e2f6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
watcher/cmd/api.py
View File

@@ -38,17 +38,18 @@ def main():
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)
host, port = cfg.CONF.api.host, cfg.CONF.api.port host, port = cfg.CONF.api.host, cfg.CONF.api.port
protocol = "http" if not CONF.api.enable_ssl_api else "https"
# Build and start the WSGI app # Build and start the WSGI app
server = service.WSGIService( server = service.WSGIService(
'watcher-api', CONF.api.enable_ssl_api) 'watcher-api', CONF.api.enable_ssl_api)
if host == '0.0.0.0': if host == '0.0.0.0':
LOG.info(_('serving on 0.0.0.0:%(port)s, ' LOG.info(_('serving on 0.0.0.0:%(port)s, '
'view at http://127.0.0.1:%(port)s') % 'view at %(protocol)s://127.0.0.1:%(port)s') %
dict(port=port)) dict(protocol=protocol, port=port))
else: else:
LOG.info(_('serving on http://%(host)s:%(port)s') % LOG.info(_('serving on %(protocol)s://%(host)s:%(port)s') %
dict(host=host, port=port)) dict(protocol=protocol, host=host, port=port))
launcher = service.process_launcher() launcher = service.process_launcher()
launcher.launch_service(server, workers=server.workers) launcher.launch_service(server, workers=server.workers)