External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

added in summary fields into logging which will solve several issues related to needing more data in logging outputs

Browse Source
This commit is contained in:
Rebeccah
2020-03-18 16:03:21 -04:00
parent 4b497b8cdc
commit 47661fad51
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/middleware.py
View File

@@ -102,13 +102,16 @@ class ActivityStreamMiddleware(threading.local, MiddlewareMixin):
for instance in ActivityStream.objects.filter(id__in=self.instance_ids): for instance in ActivityStream.objects.filter(id__in=self.instance_ids):
if drf_user and drf_user.id: if drf_user and drf_user.id:
from awx.api.serializers import ActivityStreamSerializer
ActStr = ActivityStreamSerializer(instance).to_representation(instance)
summary_fields = ActStr.get('summary_fields', {})
instance.actor = drf_user instance.actor = drf_user
try: try:
instance.save(update_fields=['actor']) instance.save(update_fields=['actor'])
analytics_logger.info('Activity Stream update entry for %s' % str(instance.object1), analytics_logger.info('Activity Stream update entry for %s' % str(instance.object1),
extra=dict(changes=instance.changes, relationship=instance.object_relationship_type, extra=dict(changes=instance.changes, relationship=instance.object_relationship_type,
actor=drf_user.username, operation=instance.operation, actor=drf_user.username, operation=instance.operation,
object1=instance.object1, object2=instance.object2)) object1=instance.object1, object2=instance.object2, summary_fields=summary_fields))
except IntegrityError: except IntegrityError:
logger.debug("Integrity Error saving Activity Stream instance for id : " + str(instance.id)) logger.debug("Integrity Error saving Activity Stream instance for id : " + str(instance.id))
# else: # else: