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

Improving the validation to show all missing keys.

Browse Source
This commit is contained in:
Mitsuo Takaki
2016-05-03 23:37:36 -07:00
parent d7bf54fa0a
commit 6f70206603
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cachet_url_monitor/configuration.py
View File

@@ -37,6 +37,8 @@ class Configuration(object):
self.validate() self.validate()
self.logger.info('Monitoring URL: %s %s' %
(self.data['endpoint']['method'], self.data['endpoint']['url']))
self.expectations = [Expectaction.create(expectation) for expectation self.expectations = [Expectaction.create(expectation) for expectation
in self.data['endpoint']['expectation']] in self.data['endpoint']['expectation']]
for expectation in self.expectations: for expectation in self.expectations:
@@ -44,16 +46,26 @@ class Configuration(object):
self.headers = {'X-Cachet-Token': self.data['cachet']['token']} self.headers = {'X-Cachet-Token': self.data['cachet']['token']}
def validate(self): def validate(self):
configuration_errors = []
for key, sub_entries in configuration_mandatory_fields.iteritems(): for key, sub_entries in configuration_mandatory_fields.iteritems():
if key not in self.data: if key not in self.data:
raise ConfigurationValidationError(('Configuration file [%s] ' configuration_errors.append(key)
'is missing key: %s') % (self.config_file, key))
for sub_key in sub_entries: for sub_key in sub_entries:
if sub_key not in self.data[key]: if sub_key not in self.data[key]:
raise ConfigurationValidationError(('Configuration file ' configuration_errors.append('%s.%s' % (key, sub_key))
'[%s] is missing key: %s.%s') % (self.config_file, key,
sub_key)) if ('endpoint' in self.data and 'expectation' in
self.data['endpoint']):
if (not isinstance(self.data['endpoint']['expectation'], list) or
(isinstance(self.data['endpoint']['expectation'], list) and
len(self.data['endpoint']['expectation']) == 0)):
configuration_errors.append('endpoint.expectation')
if len(configuration_errors) > 0:
raise ConfigurationValidationError(('Config file [%s] failed '
'validation. Missing keys: %s') % (self.config_file,
', '.join(configuration_errors)))
def evaluate(self): def evaluate(self):
"""Sends the request to the URL set in the configuration and executes """Sends the request to the URL set in the configuration and executes