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

Bring the check_callback back into the loop

Browse Source 
but try to process it only once.
This commit is contained in:
Jeff Bradberry 2019-04-03 16:04:07 -04:00
parent b4e508f72a
commit 467700e4bb
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/isolated/manager.py
View File

@ -39,6 +39,7 @@ class IsolatedManager(object):
self.check_callback = check_callback
self.idle_timeout = max(60, 2 * settings.AWX_ISOLATED_CONNECTION_TIMEOUT)
self.started_at = None
self.captured_config_artifact = False
def build_runner_params(self, hosts, verbosity=1):
env = dict(os.environ.items())
@ -188,18 +189,23 @@ class IsolatedManager(object):
self.private_data_dir,
extravars=extravars)
status, rc = runner_obj.status, runner_obj.rc
if self.check_callback is not None and not self.captured_config_artifact:
config_path = self.path_to('artifacts', self.ident, 'config')
# If the configuration artifact has been synced back, update the model
if os.path.exists(config_path):
try:
with open(config_path, 'r') as f:
data = json.load(f)
self.check_callback(data)
self.captured_config_artifact = True
except json.decoder.JSONDecodeError: # Just in case it's not fully here yet.
pass
self.consume_events(dispatcher)
last_check = time.time()
if self.check_callback is not None:
config_path = self.path_to('artifacts', self.ident, 'config')
# If the configuration artifact has been synced back, update the model
if os.path.exists(config_path):
with open(config_path, 'r') as f:
data = json.load(f)
self.check_callback(data)
if status == 'successful':
status_path = self.path_to('artifacts', self.ident, 'status')
rc_path = self.path_to('artifacts', self.ident, 'rc')