From 3b9e67ed1ba41f8d1ba3fe52d19eee65f7e1e944 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Mon, 17 Feb 2020 10:40:45 -0500 Subject: [PATCH] remove channel group model * Websocket user session <-> group subscription membership now resides in Redis rather than the database. --- awx/main/migrations/0110_delete_channelgroup.py | 16 ++++++++++++++++ awx/main/models/__init__.py | 1 - awx/main/models/channels.py | 6 ------ awx/settings/defaults.py | 5 ----- 4 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 awx/main/migrations/0110_delete_channelgroup.py delete mode 100644 awx/main/models/channels.py diff --git a/awx/main/migrations/0110_delete_channelgroup.py b/awx/main/migrations/0110_delete_channelgroup.py new file mode 100644 index 0000000000..7f571e587a --- /dev/null +++ b/awx/main/migrations/0110_delete_channelgroup.py @@ -0,0 +1,16 @@ +# Generated by Django 2.2.8 on 2020-02-17 14:50 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0109_v370_instance_ip_address'), + ] + + operations = [ + migrations.DeleteModel( + name='ChannelGroup', + ), + ] diff --git a/awx/main/models/__init__.py b/awx/main/models/__init__.py index 2dbe959511..672d5e481a 100644 --- a/awx/main/models/__init__.py +++ b/awx/main/models/__init__.py @@ -58,7 +58,6 @@ from awx.main.models.workflow import ( # noqa WorkflowJob, WorkflowJobNode, WorkflowJobOptions, WorkflowJobTemplate, WorkflowJobTemplateNode, WorkflowApproval, WorkflowApprovalTemplate, ) -from awx.main.models.channels import ChannelGroup # noqa from awx.api.versioning import reverse from awx.main.models.oauth import ( # noqa OAuth2AccessToken, OAuth2Application diff --git a/awx/main/models/channels.py b/awx/main/models/channels.py deleted file mode 100644 index bd4f9514ba..0000000000 --- a/awx/main/models/channels.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.db import models - - -class ChannelGroup(models.Model): - group = models.CharField(max_length=200, unique=True) - channels = models.TextField() diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 664259fb2d..7d00314b18 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -451,11 +451,6 @@ CELERYBEAT_SCHEDULE = { # 'isolated_heartbeat': set up at the end of production.py and development.py } -ASGI_AMQP = { - 'INIT_FUNC': 'awx.prepare_env', - 'MODEL': 'awx.main.models.channels.ChannelGroup', -} - # Django Caching Configuration CACHES = { 'default': {