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

Merge pull request #3896 from rooftopcellist/collection_no_reset

Browse Source 
collect events based on last ship, not collection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-05-17 15:32:48 +00:00
committed by GitHub
parent d353daebc5 d0e160a037
commit bd50e5d6a8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/analytics/core.py
View File

@@ -61,13 +61,11 @@ def gather(dest=None, module=None):
:pararm module: the module to search for registered analytic collector :pararm module: the module to search for registered analytic collector
functions; defaults to awx.main.analytics.collectors functions; defaults to awx.main.analytics.collectors
""" """
run_now = now() run_now = now()
state = TowerAnalyticsState.get_solo() state = TowerAnalyticsState.get_solo()
last_run = state.last_run last_run = state.last_run
logger.debug("Last analytics run was: {}".format(last_run)) logger.debug("Last analytics run was: {}".format(last_run))
state.last_run = run_now
state.save()
max_interval = now() - timedelta(days=7) max_interval = now() - timedelta(days=7)
if last_run < max_interval or not last_run: if last_run < max_interval or not last_run:
@@ -132,6 +130,12 @@ def ship(path):
] ]
output = smart_str(subprocess.check_output(cmd, timeout=60 * 5)) output = smart_str(subprocess.check_output(cmd, timeout=60 * 5))
logger.debug(output) logger.debug(output)
# reset the `last_run` when data is shipped
run_now = now()
state = TowerAnalyticsState.get_solo()
state.last_run = run_now
state.save()
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
logger.exception('{} failure:'.format(cmd)) logger.exception('{} failure:'.format(cmd))
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired: