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

Merge branch 'ansible:devel' into fix_hardcode_tmp_models_ha

Browse Source
This commit is contained in:
lucas-benedito
2022-03-25 14:28:29 +01:00
committed by GitHub
parent 01ce3440eb b6573ec2e2
commit 8af2214979
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks/system.py
View File

@@ -846,7 +846,7 @@ def handle_work_error(task_id, *args, **kwargs):
def handle_success_and_failure_notifications(job_id): def handle_success_and_failure_notifications(job_id):
uj = UnifiedJob.objects.get(pk=job_id) uj = UnifiedJob.objects.get(pk=job_id)
retries = 0 retries = 0
while retries < 5: while retries < settings.AWX_NOTIFICATION_JOB_FINISH_MAX_RETRY:
if uj.finished: if uj.finished:
uj.send_notification_templates('succeeded' if uj.status == 'successful' else 'failed') uj.send_notification_templates('succeeded' if uj.status == 'successful' else 'failed')
return return

6
awx/settings/defaults.py
View File

@@ -5,6 +5,7 @@ import base64
import os import os
import re # noqa import re # noqa
import sys import sys
import tempfile
from datetime import timedelta from datetime import timedelta
@@ -590,7 +591,7 @@ AWX_ISOLATION_SHOW_PATHS = []
# execution and isolation (such as credential files and custom # execution and isolation (such as credential files and custom
# inventory scripts). # inventory scripts).
# Note: This setting may be overridden by database settings. # Note: This setting may be overridden by database settings.
AWX_ISOLATION_BASE_PATH = "/tmp" AWX_ISOLATION_BASE_PATH = tempfile.gettempdir()
# User definable ansible callback plugins # User definable ansible callback plugins
# Note: This setting may be overridden by database settings. # Note: This setting may be overridden by database settings.
@@ -983,6 +984,9 @@ BROADCAST_WEBSOCKET_NEW_INSTANCE_POLL_RATE_SECONDS = 10
# How often websocket process will generate stats # How often websocket process will generate stats
BROADCAST_WEBSOCKET_STATS_POLL_RATE_SECONDS = 5 BROADCAST_WEBSOCKET_STATS_POLL_RATE_SECONDS = 5
# Number of times to retry sending a notification when waiting on a job to finish.
AWX_NOTIFICATION_JOB_FINISH_MAX_RETRY = 5
DJANGO_GUID = {'GUID_HEADER_NAME': 'X-API-Request-Id'} DJANGO_GUID = {'GUID_HEADER_NAME': 'X-API-Request-Id'}
# Name of the default task queue # Name of the default task queue