From 3de4aae54804e54b09805b4016b06da4e2947897 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 15 Sep 2016 13:51:17 -0400 Subject: [PATCH] Fixing up HA induced flake8 issues --- awx/main/management/commands/_base_instance.py | 2 -- awx/main/management/commands/register_instance.py | 2 -- .../management/commands/run_callback_receiver.py | 15 +++------------ awx/main/managers.py | 1 - awx/main/middleware.py | 5 +---- awx/main/models/ha.py | 4 +--- awx/plugins/callback/job_event_callback.py | 14 +++++++------- awx/settings/defaults.py | 9 ++++----- 8 files changed, 16 insertions(+), 36 deletions(-) diff --git a/awx/main/management/commands/_base_instance.py b/awx/main/management/commands/_base_instance.py index 807abfb76d..ac42eced2a 100644 --- a/awx/main/management/commands/_base_instance.py +++ b/awx/main/management/commands/_base_instance.py @@ -7,8 +7,6 @@ from optparse import make_option from django.core.management.base import BaseCommand, CommandError from django.conf import settings -from awx.main.models import Project - class OptionEnforceError(Exception): def __init__(self, value): diff --git a/awx/main/management/commands/register_instance.py b/awx/main/management/commands/register_instance.py index a7fc2f8011..e8ba1160f2 100644 --- a/awx/main/management/commands/register_instance.py +++ b/awx/main/management/commands/register_instance.py @@ -1,8 +1,6 @@ # Copyright (c) 2015 Ansible, Inc. # All Rights Reserved -from django.core.management.base import CommandError - from awx.main.management.commands._base_instance import BaseCommandInstance from awx.main.models import Instance diff --git a/awx/main/management/commands/run_callback_receiver.py b/awx/main/management/commands/run_callback_receiver.py index 0e27ba06da..dcb3906013 100644 --- a/awx/main/management/commands/run_callback_receiver.py +++ b/awx/main/management/commands/run_callback_receiver.py @@ -2,31 +2,22 @@ # All Rights Reserved. # Python -import os -import sys import datetime import logging -import signal -import time from kombu import Connection, Exchange, Queue from kombu.mixins import ConsumerMixin -from kombu.log import get_logger -from kombu.utils import kwdict, reprcall -from kombu.utils.debug import setup_logging # Django from django.conf import settings from django.core.management.base import NoArgsCommand from django.core.cache import cache -from django.db import transaction, DatabaseError +from django.db import DatabaseError from django.utils.dateparse import parse_datetime from django.utils.timezone import FixedOffset -from django.db import connection # AWX from awx.main.models import * # noqa -from awx.main.socket_queue import Socket logger = logging.getLogger('awx.main.commands.run_callback_receiver') @@ -106,7 +97,7 @@ class CallbackBrokerWorker(ConsumerMixin): i['module_args'] = '' if 'ad_hoc_command_id' in payload: - ad_hoc_command_event = AdHocCommandEvent.objects.create(**data) + AdHocCommandEvent.objects.create(**data) return j = JobEvent(**payload) @@ -119,7 +110,7 @@ class CallbackBrokerWorker(ConsumerMixin): parent_id = cache.get("{}_{}".format(payload['job_id'], parent_event_uuid), None) if parent_id is None: parent_id_obj = JobEvent.objects.filter(uuid=parent_event_uuid, job_id=payload['job_id']) - if parent_id_obj.exists(): #Problematic if not there, means the parent hasn't been written yet... TODO + if parent_id_obj.exists(): # Problematic if not there, means the parent hasn't been written yet... TODO j.parent_id = parent_id_obj[0].id print("Settings cache: {}_{} with value {}".format(payload['job_id'], parent_event_uuid, j.parent_id)) cache.set("{}_{}".format(payload['job_id'], parent_event_uuid), j.parent_id, 300) diff --git a/awx/main/managers.py b/awx/main/managers.py index ca4578daf4..b7a7f6d908 100644 --- a/awx/main/managers.py +++ b/awx/main/managers.py @@ -4,7 +4,6 @@ import sys import socket -from django.conf import settings from django.db import models diff --git a/awx/main/middleware.py b/awx/main/middleware.py index fda98f1176..021ff85ad5 100644 --- a/awx/main/middleware.py +++ b/awx/main/middleware.py @@ -8,12 +8,9 @@ import uuid from django.contrib.auth.models import User from django.db.models.signals import post_save from django.db import IntegrityError -from django.http import HttpResponseRedirect -from django.template.response import TemplateResponse from django.utils.functional import curry -from awx import __version__ as version -from awx.main.models import ActivityStream, Instance +from awx.main.models import ActivityStream from awx.main.conf import tower_settings from awx.api.authentication import TokenAuthentication diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py index a645c318e4..3f92aebc12 100644 --- a/awx/main/models/ha.py +++ b/awx/main/models/ha.py @@ -1,8 +1,6 @@ # Copyright (c) 2015 Ansible, Inc. # All Rights Reserved. -import functools - from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver @@ -11,7 +9,7 @@ from awx.main.managers import InstanceManager from awx.main.models.inventory import InventoryUpdate from awx.main.models.jobs import Job from awx.main.models.projects import ProjectUpdate -from awx.main.models.unified_jobs import UnifiedJob, CAN_CANCEL +from awx.main.models.unified_jobs import UnifiedJob __all__ = ('Instance', 'JobOrigin') diff --git a/awx/plugins/callback/job_event_callback.py b/awx/plugins/callback/job_event_callback.py index abec176b2f..1f0e41797d 100644 --- a/awx/plugins/callback/job_event_callback.py +++ b/awx/plugins/callback/job_event_callback.py @@ -161,13 +161,13 @@ class BaseCallbackModule(object): 'playbook_on_vars_prompt'): msg['parent_uuid'] = str(self.active_playbook) elif event in ('playbook_on_notify', - 'playbook_on_setup', - 'playbook_on_task_start', - 'playbook_on_no_hosts_matched', - 'playbook_on_no_hosts_remaining', - 'playbook_on_include', - 'playbook_on_import_for_host', - 'playbook_on_not_import_for_host'): + 'playbook_on_setup', + 'playbook_on_task_start', + 'playbook_on_no_hosts_matched', + 'playbook_on_no_hosts_remaining', + 'playbook_on_include', + 'playbook_on_import_for_host', + 'playbook_on_not_import_for_host'): msg['parent_uuid'] = str(self.active_play) elif event.startswith('runner_on_') or event.startswith('runner_item_on_'): msg['parent_uuid'] = str(self.active_task) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 174824d8d3..4b6ce52b7a 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -346,15 +346,14 @@ CELERY_QUEUES = ( Broadcast('projects'), ) CELERY_ROUTES = ({'awx.main.tasks.run_job': {'queue': 'jobs', - 'routing_key': 'jobs'}, + 'routing_key': 'jobs'}, 'awx.main.tasks.run_project_update': {'queue': 'projects'}, 'awx.main.tasks.run_inventory_update': {'queue': 'jobs', - 'routing_key': 'jobs'}, + 'routing_key': 'jobs'}, 'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs', - 'routing_key': 'jobs'}, + 'routing_key': 'jobs'}, 'awx.main.tasks.run_system_job': {'queue': 'jobs', - 'routing_key': 'jobs'} -}) + 'routing_key': 'jobs'}}) CELERYBEAT_SCHEDULE = { 'tower_scheduler': {