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

Merge remote-tracking branch 'ansible/devel' into merge-devel

Browse Source
This commit is contained in:
Akita Noek
2016-03-18 15:40:13 -04:00
parent 4fac1e96f4 69b2a3c868
commit 5741b47c54
84 changed files with 2911 additions and 157946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/management/commands/run_fact_cache_receiver.py
View File

@@ -67,12 +67,12 @@ class FactCacheReceiver(object):
self.timestamp = datetime.fromtimestamp(date_key, None)
# Update existing Fact entry
fact_obj = Fact.objects.filter(host__id=host_obj.id, module=module_name, timestamp=self.timestamp)
if fact_obj:
try:
fact_obj = Fact.objects.get(host__id=host_obj.id, module=module_name, timestamp=self.timestamp)
fact_obj.facts = facts
fact_obj.save()
logger.info('Updated existing fact <%s>' % (fact_obj.id))
else:
except Fact.DoesNotExist:
# Create new Fact entry
fact_obj = Fact.add_fact(host_obj.id, module_name, self.timestamp, facts)
logger.info('Created new fact <fact_id, module> <%s, %s>' % (fact_obj.id, module_name))

2
awx/main/management/commands/run_task_system.py
View File

@@ -108,6 +108,8 @@ class SimpleDAG(object):
return "inventory_update"
elif type(obj) == ProjectUpdate:
return "project_update"
elif type(obj) == SystemJob:
return "system_job"
return "unknown"
def get_dependencies(self, obj):