diff --git a/barbican/api/app.py b/barbican/api/app.py index 6d28f3558..440a724d8 100644 --- a/barbican/api/app.py +++ b/barbican/api/app.py @@ -35,6 +35,7 @@ from barbican.api.controllers import transportkeys from barbican.api.controllers import versions from barbican.api import hooks from barbican.common import config +from barbican import i18n as u from barbican.model import repositories from barbican import queue @@ -93,6 +94,10 @@ def create_main_app(global_config, **local_conf): if newrelic_loaded: wsgi_app = newrelic.agent.WSGIApplicationWrapper(wsgi_app) + + LOG = log.getLogger(__name__) + LOG.info(u._LI('Barbican app created and initialized')) + return wsgi_app diff --git a/barbican/api/controllers/consumers.py b/barbican/api/controllers/consumers.py index 8c802384b..523c66360 100644 --- a/barbican/api/controllers/consumers.py +++ b/barbican/api/controllers/consumers.py @@ -57,6 +57,9 @@ class ContainerConsumerController(controllers.ACLMixin): dict_fields = consumer.to_dict_fields() + LOG.info(u._LI('Retrieved a consumer for project: %s'), + external_project_id) + return hrefs.convert_to_hrefs( hrefs.convert_to_hrefs(dict_fields) ) @@ -116,6 +119,8 @@ class ContainerConsumersController(controllers.ACLMixin): ) resp_ctrs_overall.update({'total': total}) + LOG.info(u._LI('Retrieved a consumer list for project: %s'), + external_project_id) return resp_ctrs_overall @index.when(method='POST', template='json') @@ -142,6 +147,9 @@ class ContainerConsumersController(controllers.ACLMixin): url = hrefs.convert_consumer_to_href(new_consumer.container_id) pecan.response.headers['Location'] = url + LOG.info(u._LI('Created a consumer for project: %s'), + external_project_id) + return self._return_container_data(self.container_id, external_project_id) @@ -168,8 +176,14 @@ class ContainerConsumersController(controllers.ACLMixin): except exception.NotFound: LOG.exception(u._LE('Problem deleting consumer')) _consumer_not_found() - return self._return_container_data(self.container_id, - external_project_id) + + ret_data = self._return_container_data( + self.container_id, + external_project_id + ) + LOG.info(u._LI('Deleted a consumer for project: %s'), + external_project_id) + return ret_data def _return_container_data(self, container_id, external_project_id): try: diff --git a/barbican/api/controllers/containers.py b/barbican/api/controllers/containers.py index 83d1f39bc..1b35e9bcc 100644 --- a/barbican/api/controllers/containers.py +++ b/barbican/api/controllers/containers.py @@ -66,6 +66,8 @@ class ContainerController(controllers.ACLMixin): for secret_ref in dict_fields['secret_refs']: hrefs.convert_to_hrefs(secret_ref) + LOG.info(u._LI('Retrieved container for project: %s'), + external_project_id) return hrefs.convert_to_hrefs( hrefs.convert_to_hrefs(dict_fields) ) @@ -88,6 +90,9 @@ class ContainerController(controllers.ACLMixin): LOG.exception(u._LE('Problem deleting container')) container_not_found() + LOG.info(u._LI('Deleted container for project: %s'), + external_project_id) + for consumer in container_consumers[0]: try: self.consumer_repo.delete_entity_by_id( @@ -154,6 +159,7 @@ class ContainersController(controllers.ACLMixin): ) resp_ctrs_overall.update({'total': total}) + LOG.info(u._LI('Retrieved container list for project: %s'), project_id) return resp_ctrs_overall @index.when(method='POST', template='json') @@ -195,5 +201,7 @@ class ContainersController(controllers.ACLMixin): pecan.response.status = 201 pecan.response.headers['Location'] = url + LOG.info(u._LI('Created a container for project: %s'), + external_project_id) return {'container_ref': url} diff --git a/barbican/api/controllers/versions.py b/barbican/api/controllers/versions.py index 21ced3fe6..1660b56e2 100644 --- a/barbican/api/controllers/versions.py +++ b/barbican/api/controllers/versions.py @@ -32,7 +32,9 @@ class VersionController(object): @index.when(method='GET', template='json') @controllers.handle_exceptions(u._('Version retrieval')) def on_get(self): - return { + body = { 'v1': 'current', 'build': version.__version__ } + LOG.info(u._LI('Retrieved version')) + return body