django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-10-30 23:37:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement group_expiry on database channel backend

Browse Source
This commit is contained in:
Andrew Godwin 2016-03-28 11:59:25 +01:00
parent 59198ea93e
commit 1ab757fffb
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channels/database_layer.py
View File

@ -27,8 +27,9 @@ class DatabaseChannelLayer(object):
it's not a valid Unicode character, so it should be safe enough. it's not a valid Unicode character, so it should be safe enough.
""" """
def __init__(self, db_alias=DEFAULT_DB_ALIAS, expiry=60): def __init__(self, db_alias=DEFAULT_DB_ALIAS, expiry=60, group_expiry=86400):
self.expiry = expiry self.expiry = expiry
self.group_expiry = group_expiry
self.db_alias = db_alias self.db_alias = db_alias
# ASGI API # ASGI API
@ -165,13 +166,14 @@ class DatabaseChannelLayer(object):
class Group(models.Model): class Group(models.Model):
group = models.CharField(max_length=200) group = models.CharField(max_length=200)
channel = models.CharField(max_length=200) channel = models.CharField(max_length=200)
created = models.DateTimeField(db_index=True, auto_now_add=True)
class Meta: class Meta:
apps = Apps() apps = Apps()
app_label = "channels" app_label = "channels"
db_table = "django_channel_groups" db_table = "django_channel_groups"
unique_together = [["group", "channel"]] unique_together = [["group", "channel"]]
# Ensure its table exists # Ensure its table exists with the right schema
if Group._meta.db_table not in self.connection.introspection.table_names(self.connection.cursor()): if Group._meta.db_table not in self.connection.introspection.table_names(self.connection.cursor()):
with self.connection.schema_editor() as editor: with self.connection.schema_editor() as editor:
editor.create_model(Group) editor.create_model(Group)
@ -187,8 +189,11 @@ class DatabaseChannelLayer(object):
old_messages = self.channel_model.objects.filter(expiry__lt=target) old_messages = self.channel_model.objects.filter(expiry__lt=target)
channels_to_ungroup = old_messages.values_list("channel", flat=True).distinct() channels_to_ungroup = old_messages.values_list("channel", flat=True).distinct()
old_messages.delete() old_messages.delete()
# Now, remove channel membership from channels that expired # Now, remove channel membership from channels that expired and ones that just expired
self.group_model.objects.filter(channel__in=channels_to_ungroup).delete() self.group_model.objects.filter(
models.Q(channel__in=channels_to_ungroup) |
models.Q(created__lte=target - datetime.timedelta(seconds=self.group_expiry))
).delete()
def __str__(self): def __str__(self):
return "%s(alias=%s)" % (self.__class__.__name__, self.connection.alias) return "%s(alias=%s)" % (self.__class__.__name__, self.connection.alias)

8
channels/tests/test_database_layer.py
View File

@ -1,6 +1,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from asgiref.conformance import make_tests from asgiref.conformance import ConformanceTestCase
from ..database_layer import DatabaseChannelLayer from ..database_layer import DatabaseChannelLayer
channel_layer = DatabaseChannelLayer(expiry=1)
DatabaseLayerTests = make_tests(channel_layer, expiry_delay=2.1) class DatabaseLayerTests(ConformanceTestCase):
channel_layer = DatabaseChannelLayer(expiry=1, group_expiry=3)
expiry_delay = 2.1