mtan93/cachet-url-monitor
1
0
Fork 0
mirror of https://github.com/mtan93/cachet-url-monitor.git synced 2026-03-08 05:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from jacekszubert/better_url_handling

Browse Source 
Better url scheme handling
This commit is contained in:
mtakaki
2017-03-11 16:54:37 -08:00
committed by GitHub
parent ffa141d114 22d032308f
commit 284ef97168
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cachet_url_monitor/configuration.py
View File

@@ -54,6 +54,13 @@ def get_current_status(endpoint_url, component_id, headers):
raise ComponentNonexistentError(component_id) raise ComponentNonexistentError(component_id)
def normalize_url(url):
"""If passed url doesn't include schema return it with default one - http."""
if not url.lower().startswith('http'):
return 'http://%s' % url
return url
class Configuration(object): class Configuration(object):
"""Represents a configuration file, but it also includes the functionality """Represents a configuration file, but it also includes the functionality
of assessing the API and pushing the results to cachet. of assessing the API and pushing the results to cachet.
@@ -75,6 +82,7 @@ class Configuration(object):
self.endpoint_method = os.environ.get('ENDPOINT_METHOD') or self.data['endpoint']['method'] self.endpoint_method = os.environ.get('ENDPOINT_METHOD') or self.data['endpoint']['method']
self.endpoint_url = os.environ.get('ENDPOINT_URL') or self.data['endpoint']['url'] self.endpoint_url = os.environ.get('ENDPOINT_URL') or self.data['endpoint']['url']
self.endpoint_url = normalize_url(self.endpoint_url)
self.endpoint_timeout = os.environ.get('ENDPOINT_TIMEOUT') or self.data['endpoint'].get('timeout') or 1 self.endpoint_timeout = os.environ.get('ENDPOINT_TIMEOUT') or self.data['endpoint'].get('timeout') or 1
self.api_url = os.environ.get('CACHET_API_URL') or self.data['cachet']['api_url'] self.api_url = os.environ.get('CACHET_API_URL') or self.data['cachet']['api_url']
@@ -150,10 +158,6 @@ class Configuration(object):
self.logger.warning(self.message) self.logger.warning(self.message)
self.status = st.COMPONENT_STATUS_PERFORMANCE_ISSUES self.status = st.COMPONENT_STATUS_PERFORMANCE_ISSUES
return return
except requests.exceptions.MissingSchema:
self.logger.info('No schema specified - using default http://')
self.endpoint_url = 'http://%s' % self.endpoint_url
self.evaluate()
# We initially assume the API is healthy. # We initially assume the API is healthy.
self.status = st.COMPONENT_STATUS_OPERATIONAL self.status = st.COMPONENT_STATUS_OPERATIONAL