shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #6944 from AlanCoding/splunk_host

Browse Source 
handle Splunk hostname case from support
This commit is contained in:
Alan Rominger 2017-07-10 21:07:12 -04:00 committed by GitHub
commit 047624a857
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/tests/unit/utils/test_handlers.py
View File

@ -177,8 +177,6 @@ def test_base_logging_handler_emit_system_tracking():
@pytest.mark.parametrize('host, port, normalized, hostname_only', [
('localhost', None, 'http://localhost', False),
('localhost', 8080, 'http://localhost:8080', False),
('http://localhost', None, 'http://localhost', False),
('http://localhost', 8080, 'http://localhost:8080', False),
('https://localhost', 443, 'https://localhost:443', False),
@ -190,6 +188,12 @@ def test_base_logging_handler_emit_system_tracking():
'http://splunk.server:8088/services/collector/event', False),
('http://splunk.server/services/collector/event', 8088,
'http://splunk.server:8088/services/collector/event', False),
('splunk.server:8088/services/collector/event', 80,
'http://splunk.server:8088/services/collector/event', False),
('splunk.server/services/collector/event', 8088,
'http://splunk.server:8088/services/collector/event', False),
('localhost', None, 'http://localhost', False),
('localhost', 8080, 'http://localhost:8080', False),
('localhost', 4399, 'localhost', True),
('tcp://localhost:4399/foo/bar', 4399, 'localhost', True),
])

3
awx/main/utils/handlers.py
View File

@ -160,7 +160,8 @@ class BaseHandler(logging.Handler):
"""
host = self.host or ''
# urlparse requires '//' to be provided if scheme is not specified
if not urlparse.urlsplit(host).scheme and not host.startswith('//'):
original_parsed = urlparse.urlsplit(host)
if (not original_parsed.scheme and not host.startswith('//')) or original_parsed.hostname is None:
host = '%s://%s' % (scheme, host) if scheme else '//%s' % host
parsed = urlparse.urlsplit(host)