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

AC-982 Added configuration options to disable activity stream logging entirely, or disable only when running inventory import.

Browse Source
This commit is contained in:
Chris Church
2014-02-06 15:25:49 -05:00
parent c52818ecee
commit ae4743724a
7 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/management/commands/inventory_import.py
View File

@@ -24,7 +24,7 @@ from django.contrib.auth.models import User
# AWX
from awx.main.models import *
from awx.main.signals import ignore_inventory_computed_fields
from awx.main.signals import ignore_inventory_computed_fields, disable_activity_stream
from awx.main.licenses import LicenseReader
logger = logging.getLogger('awx.main.commands.inventory_import')
@@ -755,7 +755,11 @@ class Command(NoArgsCommand):
# Merge/overwrite inventory into database.
with ignore_inventory_computed_fields():
self.load_into_database()
if getattr(settings, 'ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC', True):
self.load_into_database()
else:
with disable_activity_stream():
self.load_into_database()
self.inventory.update_computed_fields()
self.check_license()