mirror of
https://github.com/ansible/awx.git
synced 2026-05-15 05:17:36 -02:30
Fixing up HA induced flake8 issues
This commit is contained in:
@@ -7,8 +7,6 @@ from optparse import make_option
|
|||||||
from django.core.management.base import BaseCommand, CommandError
|
from django.core.management.base import BaseCommand, CommandError
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from awx.main.models import Project
|
|
||||||
|
|
||||||
|
|
||||||
class OptionEnforceError(Exception):
|
class OptionEnforceError(Exception):
|
||||||
def __init__(self, value):
|
def __init__(self, value):
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
# Copyright (c) 2015 Ansible, Inc.
|
# Copyright (c) 2015 Ansible, Inc.
|
||||||
# All Rights Reserved
|
# All Rights Reserved
|
||||||
|
|
||||||
from django.core.management.base import CommandError
|
|
||||||
|
|
||||||
from awx.main.management.commands._base_instance import BaseCommandInstance
|
from awx.main.management.commands._base_instance import BaseCommandInstance
|
||||||
from awx.main.models import Instance
|
from awx.main.models import Instance
|
||||||
|
|
||||||
|
|||||||
@@ -2,31 +2,22 @@
|
|||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
|
|
||||||
# Python
|
# Python
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import datetime
|
import datetime
|
||||||
import logging
|
import logging
|
||||||
import signal
|
|
||||||
import time
|
|
||||||
|
|
||||||
from kombu import Connection, Exchange, Queue
|
from kombu import Connection, Exchange, Queue
|
||||||
from kombu.mixins import ConsumerMixin
|
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
|
# Django
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.management.base import NoArgsCommand
|
from django.core.management.base import NoArgsCommand
|
||||||
from django.core.cache import cache
|
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.dateparse import parse_datetime
|
||||||
from django.utils.timezone import FixedOffset
|
from django.utils.timezone import FixedOffset
|
||||||
from django.db import connection
|
|
||||||
|
|
||||||
# AWX
|
# AWX
|
||||||
from awx.main.models import * # noqa
|
from awx.main.models import * # noqa
|
||||||
from awx.main.socket_queue import Socket
|
|
||||||
|
|
||||||
logger = logging.getLogger('awx.main.commands.run_callback_receiver')
|
logger = logging.getLogger('awx.main.commands.run_callback_receiver')
|
||||||
|
|
||||||
@@ -106,7 +97,7 @@ class CallbackBrokerWorker(ConsumerMixin):
|
|||||||
i['module_args'] = ''
|
i['module_args'] = ''
|
||||||
|
|
||||||
if 'ad_hoc_command_id' in payload:
|
if 'ad_hoc_command_id' in payload:
|
||||||
ad_hoc_command_event = AdHocCommandEvent.objects.create(**data)
|
AdHocCommandEvent.objects.create(**data)
|
||||||
return
|
return
|
||||||
|
|
||||||
j = JobEvent(**payload)
|
j = JobEvent(**payload)
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
import sys
|
import sys
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,12 +8,9 @@ import uuid
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.db import IntegrityError
|
from django.db import IntegrityError
|
||||||
from django.http import HttpResponseRedirect
|
|
||||||
from django.template.response import TemplateResponse
|
|
||||||
from django.utils.functional import curry
|
from django.utils.functional import curry
|
||||||
|
|
||||||
from awx import __version__ as version
|
from awx.main.models import ActivityStream
|
||||||
from awx.main.models import ActivityStream, Instance
|
|
||||||
from awx.main.conf import tower_settings
|
from awx.main.conf import tower_settings
|
||||||
from awx.api.authentication import TokenAuthentication
|
from awx.api.authentication import TokenAuthentication
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
# Copyright (c) 2015 Ansible, Inc.
|
# Copyright (c) 2015 Ansible, Inc.
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
|
|
||||||
import functools
|
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.dispatch import receiver
|
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.inventory import InventoryUpdate
|
||||||
from awx.main.models.jobs import Job
|
from awx.main.models.jobs import Job
|
||||||
from awx.main.models.projects import ProjectUpdate
|
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')
|
__all__ = ('Instance', 'JobOrigin')
|
||||||
|
|
||||||
|
|||||||
@@ -353,8 +353,7 @@ CELERY_ROUTES = ({'awx.main.tasks.run_job': {'queue': 'jobs',
|
|||||||
'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs',
|
'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs',
|
||||||
'routing_key': 'jobs'},
|
'routing_key': 'jobs'},
|
||||||
'awx.main.tasks.run_system_job': {'queue': 'jobs',
|
'awx.main.tasks.run_system_job': {'queue': 'jobs',
|
||||||
'routing_key': 'jobs'}
|
'routing_key': 'jobs'}})
|
||||||
})
|
|
||||||
|
|
||||||
CELERYBEAT_SCHEDULE = {
|
CELERYBEAT_SCHEDULE = {
|
||||||
'tower_scheduler': {
|
'tower_scheduler': {
|
||||||
|
|||||||
Reference in New Issue
Block a user