From 01895bafc0f6baa70584c80d7ae6911084062134 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Jan 2018 11:40:18 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20task=E8=BF=90=E8=A1=8C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=EF=BC=8C=E5=9B=A0=E4=B8=BAtasks=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/models.py | 2 +- apps/ops/utils.py | 2 ++ apps/terminal/signals_handler.py | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/ops/models.py b/apps/ops/models.py index 3c96f5146..471df25d7 100644 --- a/apps/ops/models.py +++ b/apps/ops/models.py @@ -165,7 +165,7 @@ class AdHoc(models.Model): if item and isinstance(item, list): self._tasks = json.dumps(item) else: - raise SyntaxError('Tasks should be a list') + raise SyntaxError('Tasks should be a list: {}'.format(item)) @property def hosts(self): diff --git a/apps/ops/utils.py b/apps/ops/utils.py index 0a9dce8c9..8ff9c321f 100644 --- a/apps/ops/utils.py +++ b/apps/ops/utils.py @@ -16,6 +16,8 @@ def update_or_create_ansible_task( run_as_admin=False, run_as="", become_info=None, created_by=None, ): + if not hosts or not tasks or not task_name: + return defaults = { 'name': task_name, diff --git a/apps/terminal/signals_handler.py b/apps/terminal/signals_handler.py index 757a97bc6..3926a5751 100644 --- a/apps/terminal/signals_handler.py +++ b/apps/terminal/signals_handler.py @@ -13,10 +13,6 @@ RUNNING = False logger = get_logger(__file__) -@shared_task -@register_as_period_task(interval=3600) -@after_app_ready_start -@after_app_shutdown_clean def set_session_info_cache(): logger.debug("") from .utils import get_session_asset_list, get_session_user_list, \