installing the digicert CIS plugin (#537)

This commit is contained in:
kevgliss
2016-11-29 10:02:40 -08:00
committed by GitHub
parent bfc80f982c
commit 3db3214cbe
4 changed files with 13 additions and 49 deletions

View File

@ -8,6 +8,8 @@
"""
from flask import current_app
from lemur.exceptions import InvalidConfiguration
# inspired by https://github.com/getsentry/sentry
class InstanceManager(object):
@ -58,8 +60,10 @@ class InstanceManager(object):
results.append(cls())
else:
results.append(cls)
except InvalidConfiguration as e:
current_app.logger.warning("Plugin '{0}' may not work correctly. {1}".format(class_name, e))
except Exception as e:
current_app.logger.exception('Unable to import %s. Reason: %s', cls_path, e)
current_app.logger.exception("Unable to import {0}. Reason: {1}".format(cls_path, e))
continue
self.cache = results

View File

@ -14,6 +14,8 @@ from cryptography.hazmat.backends import default_backend
from flask_restful.reqparse import RequestParser
from lemur.exceptions import InvalidConfiguration
paginated_parser = RequestParser()
paginated_parser.add_argument('count', type=int, default=10, location='args')
@ -61,6 +63,4 @@ def validate_conf(app, required_vars):
"""
for var in required_vars:
if not app.config.get(var):
raise Exception("Required variable {var} is not set, ensure that it is set in Lemur's configuration file".format(
var=var
))
raise InvalidConfiguration("Required variable '{var}' is not set in Lemur's conf.".format(var=var))