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

Fix sync-only operation in async context

Browse Source
This commit is contained in:
Seth Foster
2022-03-21 11:40:19 -04:00
parent 45bd143c07
commit acebff7be1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/analytics/subsystem_metrics.py
View File

@@ -136,7 +136,7 @@ class HistogramM(BaseM):
class Metrics:
def __init__(self, auto_pipe_execute=True):
def __init__(self, auto_pipe_execute=True, instance_name=None):
self.pipe = redis.Redis.from_url(settings.BROKER_URL).pipeline()
self.conn = redis.Redis.from_url(settings.BROKER_URL)
self.last_pipe_execute = time.time()
@@ -150,7 +150,10 @@ class Metrics:
# the calling function should call .pipe_execute() explicitly
self.auto_pipe_execute = auto_pipe_execute
Instance = apps.get_model('main', 'Instance')
self.instance_name = Instance.objects.me().hostname
if instance_name:
self.instance_name = instance_name
else:
self.instance_name = Instance.objects.me().hostname
# metric name, help_text
METRICSLIST = [