From 4735565cb85a6b7c79eac9304490f995a5a4bab7 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 21 Feb 2023 15:33:15 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20inventory=20=E4=B8=BA=E7=A9=BA=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B7=B3=E8=BF=87=20(#9664)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/assets/automations/base/manager.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index bb5963981..52b915670 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -174,6 +174,12 @@ class BasePlaybookManager: self.runtime_dir, callback=PlaybookCallback(), ) + + with open(inventory_path, 'r') as f: + inventory_data = json.load(f) + if not inventory_data['all'].get('hosts'): + continue + runners.append(runer) return runners @@ -244,11 +250,12 @@ class BasePlaybookManager: self.before_runner_start(runner) try: cb = runner.run(**kwargs) - self.delete_sensitive_data(runner.inventory) self.on_runner_success(runner, cb) except Exception as e: self.on_runner_failed(runner, e) - print('\n') + finally: + self.delete_sensitive_data(runner.inventory) + print('\n') self.execution.status = 'success' self.execution.date_finished = timezone.now() self.execution.save()