diff --git a/sapl/crud/base.py b/sapl/crud/base.py index 788fd949a..e720b36cd 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -118,7 +118,8 @@ class SearchMixin(models.Model): try: search += str(getattr(self, str_field)) + ' ' except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) pass else: _self = self @@ -556,7 +557,8 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView): try: fm = model._meta.get_field(fo) except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) pass if fm and hasattr(fm, 'related_model')\ @@ -627,7 +629,8 @@ class CrudCreateView(PermissionRequiredContainerCrudMixin, self.object.owner = self.request.user self.object.modifier = self.request.user except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) pass if self.container_field: @@ -698,7 +701,8 @@ class CrudDetailView(PermissionRequiredContainerCrudMixin, fieldname).related_model._meta.verbose_name_plural) for fieldname in self.list_field_names_set] except Exception as e: - self.logger.error(tr(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) obj = self.crud if hasattr(self, 'crud') else self return [getattr( self.object, @@ -726,7 +730,8 @@ class CrudDetailView(PermissionRequiredContainerCrudMixin, if i == 0 else None) for i, name in enumerate(self.list_field_names_set)] except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) return [( getattr(obj, name), self.resolve_model_set_url(ACTION_DETAIL, args=(obj.id,)) @@ -742,7 +747,8 @@ class CrudDetailView(PermissionRequiredContainerCrudMixin, try: self.object = self.model.objects.get(pk=kwargs.get('pk')) except Exception as e: - self.logger.error(str(e)) + username = request.user.username + self.logger.error("user=" + username + ". " + str(e)) raise Http404 obj = self.crud if hasattr(self, 'crud') else self if hasattr(obj, 'model_set') and obj.model_set: @@ -823,7 +829,8 @@ class CrudUpdateView(PermissionRequiredContainerCrudMixin, try: self.object.modifier = self.request.user except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) pass return super().form_valid(form) @@ -867,13 +874,20 @@ class CrudDeleteView(PermissionRequiredContainerCrudMixin, error_msg = 'Registro não pode ser removido, pois\ é referenciado por outros registros:
\ ' - self.logger.error("Registro não pode ser removido, pois " - "é referenciado por outros registros") + + username = request.user.username + self.logger.error("user=" + username + ". Registro não pode ser removido, pois " + "é referenciado por outros registros: " + error_msg2) messages.add_message(request, messages.ERROR, error_msg) @@ -1116,7 +1130,8 @@ class MasterDetailCrud(Crud): try: parent_object = parent_model.objects.get(**params) except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) raise Http404() context[ @@ -1182,7 +1197,8 @@ class MasterDetailCrud(Crud): try: parent_object = parent_model.objects.get(**params) except Exception as e: - self.logger.error(str(e)) + username = self.request.user.username + self.logger.error("user=" + username + ". " + str(e)) raise Http404() else: parent_model = self.model diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 77c46ce10..3c1da0380 100755 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -1582,7 +1582,7 @@ class ExpedienteView(FormMixin, DetailView): msg = _('Registro salvo com sucesso') messages.add_message(self.request, messages.SUCCESS, msg) - self.logger.info('user=' + username + '. ExpedienteSessao(sessao_plenaria_id={} e tipo_id{}) salvo com sucesso.' + self.logger.info('user=' + username + '. ExpedienteSessao(sessao_plenaria_id={} e tipo_id={}) salvo com sucesso.' .format(self.object.id, tipo)) return self.form_valid(form) diff --git a/sapl/settings.py b/sapl/settings.py index 9261908a3..7e382fc4e 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -14,6 +14,7 @@ See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ """ import socket +import logging from decouple import config from dj_database_url import parse as db_url