External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 07:26:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6337 from rebeccahhh/activity-stream-grab-bag

Browse Source 
add in summary fields to activity stream logging output

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-31 19:15:51 +00:00
committed by GitHub
parent 13faa0ed2e 5bfe89be6e
commit cfa0fdaa12
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/middleware.py
View File

@@ -101,14 +101,16 @@ class ActivityStreamMiddleware(threading.local, MiddlewareMixin):
post_save.disconnect(dispatch_uid=self.disp_uid) post_save.disconnect(dispatch_uid=self.disp_uid)
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
summary_fields = ActivityStreamSerializer(instance).get_summary_fields(instance)
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: